diff --git a/common/helpers/bit_helpers.h b/common/helpers/bit_helpers.h index 1fae6e12a0..595530e3bb 100644 --- a/common/helpers/bit_helpers.h +++ b/common/helpers/bit_helpers.h @@ -10,7 +10,7 @@ #include #include -namespace OCLRT { +namespace NEO { constexpr bool isBitSet(uint64_t field, uint64_t bitPosition) { assert(bitPosition < std::numeric_limits::digits); // undefined behavior @@ -26,4 +26,4 @@ constexpr bool isFieldValid(uint64_t field, uint64_t acceptedBits) { return ((field & (~acceptedBits)) == 0); } -} // namespace OCLRT +} // namespace NEO diff --git a/manifests/manifest.yml b/manifests/manifest.yml index a376e06264..e93c6184de 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -17,7 +17,7 @@ components: branch: infra clean_on_sync: true dest_dir: infra - revision: 484c96b9de91f68d5de6ba5dc53b88e3bd116cd0 + revision: e4c457da1c71712ce63d036f6920ba5d97b81ea3 type: git internal: branch: master diff --git a/offline_compiler/helper.cpp b/offline_compiler/helper.cpp index 9ea474335b..3f789a93be 100644 --- a/offline_compiler/helper.cpp +++ b/offline_compiler/helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/utilities/debug_settings_reader_creator.h" -namespace OCLRT { +namespace NEO { template DebugSettingsManager::DebugSettingsManager() { @@ -45,4 +45,4 @@ bool familyEnabled[IGFX_MAX_CORE] = { false, }; -} // namespace OCLRT +} // namespace NEO diff --git a/offline_compiler/main.cpp b/offline_compiler/main.cpp index 37b2a8f6ed..623f082b47 100644 --- a/offline_compiler/main.cpp +++ b/offline_compiler/main.cpp @@ -13,7 +13,7 @@ #include "decoder/binary_encoder.h" #include -using namespace OCLRT; +using namespace NEO; int main(int numArgs, const char *argv[]) { try { diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index 46246b6937..3e8e3f9777 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -42,7 +42,7 @@ #define GetCurrentWorkingDirectory getcwd #endif -namespace OCLRT { +namespace NEO { CIF::CIFMain *createMainNoSanitize(CIF::CreateCIFMainFunc_t createFunc); @@ -133,8 +133,8 @@ int OfflineCompiler::buildSourceCode() { auto fclTranslationCtx = fclDeviceCtx->CreateTranslationCtx(IGC::CodeType::oclC, intermediateRepresentation); auto igcTranslationCtx = igcDeviceCtx->CreateTranslationCtx(intermediateRepresentation, IGC::CodeType::oclGenBin); - if (false == OCLRT::areNotNullptr(fclSrc.get(), fclOptions.get(), fclInternalOptions.get(), - fclTranslationCtx.get(), igcTranslationCtx.get())) { + if (false == NEO::areNotNullptr(fclSrc.get(), fclOptions.get(), fclInternalOptions.get(), + fclTranslationCtx.get(), igcTranslationCtx.get())) { retVal = CL_OUT_OF_HOST_MEMORY; break; } @@ -584,7 +584,7 @@ std::string OfflineCompiler::parseBinAsCharArray(uint8_t *binary, size_t size, s out << std::endl << "#include \"runtime/built_ins/registry/built_ins_registry.h\"\n" << std::endl; - out << "namespace OCLRT {" << std::endl; + out << "namespace NEO {" << std::endl; out << "static RegisterEmbeddedResource register" << builtinName << "Bin(" << std::endl; out << " createBuiltinResourceName(" << std::endl; out << " EBuiltInOps::" << builtinName << "," << std::endl; @@ -827,4 +827,4 @@ std::string generateFilePath(const std::string &directory, const std::string &fi return ret; } -} // namespace OCLRT +} // namespace NEO diff --git a/offline_compiler/offline_compiler.h b/offline_compiler/offline_compiler.h index 2146d720b6..7b5a15bb45 100644 --- a/offline_compiler/offline_compiler.h +++ b/offline_compiler/offline_compiler.h @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class OsLibrary; @@ -112,4 +112,4 @@ class OfflineCompiler { CIF::RAII::UPtr_t fclDeviceCtx = nullptr; IGC::CodeType::CodeType_t preferredIntermediateRepresentation; }; -} // namespace OCLRT +} // namespace NEO diff --git a/offline_compiler/options.cpp b/offline_compiler/options.cpp index a40b394f0b..4d17e90798 100644 --- a/offline_compiler/options.cpp +++ b/offline_compiler/options.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { // AUB file folder location const char *folderAUB = "aub_out"; @@ -28,4 +28,4 @@ static const HardwareInfo *DefaultPlatformDevices[] = size_t numPlatformDevices = arrayCount(DefaultPlatformDevices); const HardwareInfo **platformDevices = DefaultPlatformDevices; -} // namespace OCLRT +} // namespace NEO diff --git a/offline_compiler/utilities/linux/safety_caller_linux.cpp b/offline_compiler/utilities/linux/safety_caller_linux.cpp index 1e4c4ce7b0..049a2ebc69 100644 --- a/offline_compiler/utilities/linux/safety_caller_linux.cpp +++ b/offline_compiler/utilities/linux/safety_caller_linux.cpp @@ -9,7 +9,7 @@ #include "offline_compiler/utilities/linux/safety_guard_linux.h" #include "runtime/os_interface/os_library.h" -using namespace OCLRT; +using namespace NEO; int buildWithSafetyGuard(OfflineCompiler *compiler) { SafetyGuardLinux safetyGuard; diff --git a/offline_compiler/utilities/linux/safety_guard_linux.h b/offline_compiler/utilities/linux/safety_guard_linux.h index f427e095b3..36435d16e7 100644 --- a/offline_compiler/utilities/linux/safety_guard_linux.h +++ b/offline_compiler/utilities/linux/safety_guard_linux.h @@ -55,7 +55,7 @@ class SafetyGuardLinux { if (onSigSegv) { onSigSegv(); } else { - OCLRT::abortExecution(); + NEO::abortExecution(); } } return retValueOnCrash; diff --git a/offline_compiler/utilities/safety_caller.h b/offline_compiler/utilities/safety_caller.h index a40ef8eb0e..9f5d0145e7 100644 --- a/offline_compiler/utilities/safety_caller.h +++ b/offline_compiler/utilities/safety_caller.h @@ -1,13 +1,13 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -namespace OCLRT { +namespace NEO { class OfflineCompiler; } -extern int buildWithSafetyGuard(OCLRT::OfflineCompiler *compiler); \ No newline at end of file +extern int buildWithSafetyGuard(NEO::OfflineCompiler *compiler); \ No newline at end of file diff --git a/offline_compiler/utilities/windows/safety_caller_windows.cpp b/offline_compiler/utilities/windows/safety_caller_windows.cpp index 856d8fec34..7cb7dfbb30 100644 --- a/offline_compiler/utilities/windows/safety_caller_windows.cpp +++ b/offline_compiler/utilities/windows/safety_caller_windows.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "offline_compiler/offline_compiler.h" #include "offline_compiler/utilities/windows/safety_guard_windows.h" -using namespace OCLRT; +using namespace NEO; int buildWithSafetyGuard(OfflineCompiler *compiler) { SafetyGuardWindows safetyGuard; diff --git a/offline_compiler/utilities/windows/safety_guard_windows.h b/offline_compiler/utilities/windows/safety_guard_windows.h index eacfbb13fd..17384f5edf 100644 --- a/offline_compiler/utilities/windows/safety_guard_windows.h +++ b/offline_compiler/utilities/windows/safety_guard_windows.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ class SafetyGuardWindows { if (onExcept) { onExcept(); } else { - OCLRT::abortExecution(); + NEO::abortExecution(); } longjmp(jmpbuf, 1); } diff --git a/offline_compiler/utilities/windows/seh_exception.cpp b/offline_compiler/utilities/windows/seh_exception.cpp index 1f68e65282..dcece1ecc6 100644 --- a/offline_compiler/utilities/windows/seh_exception.cpp +++ b/offline_compiler/utilities/windows/seh_exception.cpp @@ -89,7 +89,7 @@ void SehException::getCallStack(unsigned int code, struct _EXCEPTION_POINTERS *e DWORD displacement = 0; DWORD64 displacement64 = 0; - unique_ptr psApiLib(OCLRT::OsLibrary::load("psapi.dll")); + unique_ptr psApiLib(NEO::OsLibrary::load("psapi.dll")); auto getMappedFileName = reinterpret_cast(psApiLib->getProcAddress("GetMappedFileNameA")); size_t callstackCounter = 0; diff --git a/runtime/accelerators/intel_accelerator.cpp b/runtime/accelerators/intel_accelerator.cpp index a0e677dcc9..695eb88094 100644 --- a/runtime/accelerators/intel_accelerator.cpp +++ b/runtime/accelerators/intel_accelerator.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/get_info.h" #include "runtime/helpers/string.h" -namespace OCLRT { +namespace NEO { cl_int IntelAccelerator::getInfo(cl_accelerator_info_intel paramName, size_t paramValueSize, @@ -64,4 +64,4 @@ cl_int IntelAccelerator::getInfo(cl_accelerator_info_intel paramName, return result; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/accelerators/intel_accelerator.h b/runtime/accelerators/intel_accelerator.h index fd3d7b859e..00e0980939 100644 --- a/runtime/accelerators/intel_accelerator.h +++ b/runtime/accelerators/intel_accelerator.h @@ -1,23 +1,8 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once @@ -29,7 +14,7 @@ // cl_intel_accelerator Class Stuff //------------------------------------------------------------------------------ -namespace OCLRT { +namespace NEO { class Context; @@ -76,4 +61,4 @@ class IntelAccelerator : public BaseObject<_cl_accelerator_intel> { private: }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/accelerators/intel_motion_estimation.cpp b/runtime/accelerators/intel_motion_estimation.cpp index fef01f5627..d2153c25da 100644 --- a/runtime/accelerators/intel_motion_estimation.cpp +++ b/runtime/accelerators/intel_motion_estimation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/accelerators/intel_motion_estimation.h" -namespace OCLRT { +namespace NEO { cl_int VmeAccelerator::validateVmeArgs(Context *context, cl_accelerator_type_intel typeId, @@ -61,4 +61,4 @@ cl_int VmeAccelerator::validateVmeArgs(Context *context, return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/accelerators/intel_motion_estimation.h b/runtime/accelerators/intel_motion_estimation.h index 92468f8401..d28455c0c4 100644 --- a/runtime/accelerators/intel_motion_estimation.h +++ b/runtime/accelerators/intel_motion_estimation.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ // VmeAccelerator Class Stuff //------------------------------------------------------------------------------ -namespace OCLRT { +namespace NEO { class Context; @@ -54,4 +54,4 @@ class VmeAccelerator : public IntelAccelerator { size_t descriptorSize, const void *descriptor); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 1bb330fbf3..4f56ee4de1 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -43,7 +43,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; cl_int CL_API_CALL clGetPlatformIDs(cl_uint numEntries, cl_platform_id *platforms, @@ -3663,7 +3663,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel, pKernel->clearKernelExecInfo(); for (uint32_t i = 0; i < numPointers; i++) { - OCLRT::GraphicsAllocation *pSvmAlloc = + NEO::GraphicsAllocation *pSvmAlloc = pKernel->getContext().getSVMAllocsManager()->getSVMAlloc((const void *)pSvmPtrList[i]); if (pSvmAlloc == nullptr) { retVal = CL_INVALID_VALUE; diff --git a/runtime/aub/aub_center.cpp b/runtime/aub/aub_center.cpp index 7ce9e8798a..f3c85b2edd 100644 --- a/runtime/aub/aub_center.cpp +++ b/runtime/aub/aub_center.cpp @@ -17,7 +17,7 @@ #include "third_party/aub_stream/headers/modes.h" #include "third_party/aub_stream/headers/options.h" -namespace OCLRT { +namespace NEO { extern aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode); AubCenter::AubCenter(const HardwareInfo *pHwInfo, bool localMemoryEnabled, const std::string &aubFileName, CommandStreamReceiverType csrType) { @@ -87,4 +87,4 @@ uint32_t AubCenter::getAubStreamMode(const std::string &aubFileName, uint32_t cs return mode; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_center.h b/runtime/aub/aub_center.h index 21fe6c9fc8..14aa8eedec 100644 --- a/runtime/aub/aub_center.h +++ b/runtime/aub/aub_center.h @@ -14,7 +14,7 @@ #include "third_party/aub_stream/headers/aub_manager.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; class AubCenter { @@ -59,4 +59,4 @@ class AubCenter { std::unique_ptr aubManager; uint32_t aubStreamMode = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_helper.cpp b/runtime/aub/aub_helper.cpp index 06c28caab5..911820a0f0 100644 --- a/runtime/aub/aub_helper.cpp +++ b/runtime/aub/aub_helper.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/basic_math.h" #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { uint64_t AubHelper::getTotalMemBankSize() { return 2 * GB; @@ -33,4 +33,4 @@ uint64_t AubHelper::getMemBankSize(const HardwareInfo *pHwInfo) { return getTotalMemBankSize(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_helper.h b/runtime/aub/aub_helper.h index d42f15cb23..0e02b14a26 100644 --- a/runtime/aub/aub_helper.h +++ b/runtime/aub/aub_helper.h @@ -11,7 +11,7 @@ #include "runtime/helpers/properties_helper.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class AubHelper : public NonCopyableOrMovableClass { public: @@ -68,4 +68,4 @@ class AubHelperHw : public AubHelper { bool localMemoryEnabled; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_helper.inl b/runtime/aub/aub_helper.inl index 2fc5d75ce9..1dd7fa8bbd 100644 --- a/runtime/aub/aub_helper.inl +++ b/runtime/aub/aub_helper.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/aub_mem_dump/aub_mem_dump.h" -namespace OCLRT { +namespace NEO { template int AubHelperHw::getDataHintForPml4Entry() const { @@ -58,4 +58,4 @@ int AubHelperHw::getMemTraceForPtEntry() const { return AubMemDump::AddressSpaceValues::TracePpgttEntry; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_helper_add_mmio.cpp b/runtime/aub/aub_helper_add_mmio.cpp index 530185a191..c59bf2f2bc 100644 --- a/runtime/aub/aub_helper_add_mmio.cpp +++ b/runtime/aub/aub_helper_add_mmio.cpp @@ -10,7 +10,7 @@ #include "third_party/aub_stream/headers/options.h" -namespace OCLRT { +namespace NEO { MMIOList AubHelper::getAdditionalMmioList() { return splitMMIORegisters(DebugManager.flags.AubDumpAddMmioRegistersList.get(), ';'); @@ -52,4 +52,4 @@ MMIOList AubHelper::splitMMIORegisters(const std::string ®isters, char delimi return result; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub/aub_stream_interface.cpp b/runtime/aub/aub_stream_interface.cpp index 103fa8bd51..78295ec9e1 100644 --- a/runtime/aub/aub_stream_interface.cpp +++ b/runtime/aub/aub_stream_interface.cpp @@ -7,8 +7,8 @@ #include "runtime/aub/aub_center.h" using namespace aub_stream; -namespace OCLRT { +namespace NEO { AubManager *createAubManager(uint32_t gfxFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) { return AubManager::create(gfxFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/aub_mem_dump/aub_alloc_dump.h b/runtime/aub_mem_dump/aub_alloc_dump.h index 7e0ca09823..97ab92660b 100644 --- a/runtime/aub_mem_dump/aub_alloc_dump.h +++ b/runtime/aub_mem_dump/aub_alloc_dump.h @@ -14,7 +14,7 @@ #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/debug_settings_manager.h" -using namespace OCLRT; +using namespace NEO; namespace AubAllocDump { diff --git a/runtime/aub_mem_dump/aub_alloc_dump.inl b/runtime/aub_mem_dump/aub_alloc_dump.inl index 467a2fcd78..c2bb708ab6 100644 --- a/runtime/aub_mem_dump/aub_alloc_dump.inl +++ b/runtime/aub_mem_dump/aub_alloc_dump.inl @@ -8,7 +8,7 @@ #include "runtime/aub_mem_dump/aub_alloc_dump.h" #include "runtime/gmm_helper/gmm.h" -using namespace OCLRT; +using namespace NEO; namespace AubAllocDump { diff --git a/runtime/aub_mem_dump/aub_mem_dump.cpp b/runtime/aub_mem_dump/aub_mem_dump.cpp index 615df84e81..d87973cfa9 100644 --- a/runtime/aub_mem_dump/aub_mem_dump.cpp +++ b/runtime/aub_mem_dump/aub_mem_dump.cpp @@ -178,11 +178,11 @@ void LrcaHelper::initialize(void *pLRCIn) const { } void AubStream::writeMMIO(uint32_t offset, uint32_t value) { - auto dbgOffset = OCLRT::DebugManager.flags.AubDumpOverrideMmioRegister.get(); + auto dbgOffset = NEO::DebugManager.flags.AubDumpOverrideMmioRegister.get(); if (dbgOffset > 0) { if (offset == static_cast(dbgOffset)) { offset = static_cast(dbgOffset); - value = static_cast(OCLRT::DebugManager.flags.AubDumpOverrideMmioRegisterValue.get()); + value = static_cast(NEO::DebugManager.flags.AubDumpOverrideMmioRegisterValue.get()); } } writeMMIOImpl(offset, value); diff --git a/runtime/aub_mem_dump/aub_mem_dump.h b/runtime/aub_mem_dump/aub_mem_dump.h index 78ae5362b8..1c208c26e1 100644 --- a/runtime/aub_mem_dump/aub_mem_dump.h +++ b/runtime/aub_mem_dump/aub_mem_dump.h @@ -17,7 +17,7 @@ #include "runtime/aub_mem_dump/aub_data.h" -namespace OCLRT { +namespace NEO { class AubHelper; } @@ -243,7 +243,7 @@ struct AubPageTableHelper32 : public AubPageTableHelper, PageTableTraits static void createContext(typename Traits::Stream &stream, uint32_t context); static uint64_t reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress, size_t blockSize, uint64_t physAddress, - uint64_t additionalBits, const OCLRT::AubHelper &aubHelper); + uint64_t additionalBits, const NEO::AubHelper &aubHelper); static void fixupLRC(uint8_t *pLrc); }; @@ -259,7 +259,7 @@ struct AubPageTableHelper64 : public AubPageTableHelper, PageTableTraits static void createContext(typename Traits::Stream &stream, uint32_t context); static uint64_t reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress, size_t blockSize, uint64_t physAddress, - uint64_t additionalBits, const OCLRT::AubHelper &aubHelper); + uint64_t additionalBits, const NEO::AubHelper &aubHelper); static void fixupLRC(uint8_t *pLrc); }; @@ -294,7 +294,7 @@ struct AubDump : public std::conditional void AubDump::reserveAddressGGTTAndWriteMmeory(typename Traits::Stream &stream, uintptr_t gfxAddress, const void *memory, uint64_t physAddress, size_t size, size_t offset, - uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) { + uint64_t additionalBits, const NEO::AubHelper &aubHelper) { auto vmAddr = (gfxAddress + offset) & ~(MemoryConstants::pageSize - 1); auto pAddr = physAddress & ~(MemoryConstants::pageSize - 1); AubDump::reserveAddressPPGTT(stream, vmAddr, MemoryConstants::pageSize, pAddr, additionalBits, aubHelper); - int hint = OCLRT::AubHelper::getMemTrace(additionalBits); + int hint = NEO::AubHelper::getMemTrace(additionalBits); AubDump::addMemoryWrite(stream, physAddress, reinterpret_cast(reinterpret_cast(memory) + offset), @@ -144,7 +144,7 @@ void AubDump::setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTDat template uint64_t AubPageTableHelper32::reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress, size_t blockSize, uint64_t physAddress, - uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) { + uint64_t additionalBits, const NEO::AubHelper &aubHelper) { auto startAddress = gfxAddress; auto endAddress = gfxAddress + blockSize - 1; @@ -169,7 +169,7 @@ uint64_t AubPageTableHelper32::reserveAddressPPGTT(typename Traits::Stre auto currPDE = startPDE; auto physPage = BaseClass::getPTEAddress(startPTE) & g_pageMask; while (currPDE <= endPDE) { - auto pde = physPage | OCLRT::AubHelper::getPTEntryBits(additionalBits); + auto pde = physPage | NEO::AubHelper::getPTEntryBits(additionalBits); stream.writePTE(startAddress, pde, addressSpace); startAddress += sizeof(pde); @@ -208,7 +208,7 @@ uint64_t AubPageTableHelper32::reserveAddressPPGTT(typename Traits::Stre template uint64_t AubPageTableHelper64::reserveAddressPPGTT(typename Traits::Stream &stream, uintptr_t gfxAddress, size_t blockSize, uint64_t physAddress, - uint64_t additionalBits, const OCLRT::AubHelper &aubHelper) { + uint64_t additionalBits, const NEO::AubHelper &aubHelper) { auto startAddress = gfxAddress; auto endAddress = gfxAddress + blockSize - 1; @@ -241,7 +241,7 @@ uint64_t AubPageTableHelper64::reserveAddressPPGTT(typename Traits::Stre auto currPML4 = startPML4; auto physPage = BaseClass::getPDPAddress(startPDP) & g_pageMask; while (currPML4 <= endPML4) { - auto pml4 = physPage | OCLRT::AubHelper::getPTEntryBits(additionalBits); + auto pml4 = physPage | NEO::AubHelper::getPTEntryBits(additionalBits); stream.writePTE(startAddress, pml4, addressSpace); startAddress += sizeof(pml4); @@ -264,7 +264,7 @@ uint64_t AubPageTableHelper64::reserveAddressPPGTT(typename Traits::Stre auto currPDP = startPDP; auto physPage = BaseClass::getPDEAddress(startPDE) & g_pageMask; while (currPDP <= endPDP) { - auto pdp = physPage | OCLRT::AubHelper::getPTEntryBits(additionalBits); + auto pdp = physPage | NEO::AubHelper::getPTEntryBits(additionalBits); stream.writePTE(startAddress, pdp, addressSpace); startAddress += sizeof(pdp); @@ -287,7 +287,7 @@ uint64_t AubPageTableHelper64::reserveAddressPPGTT(typename Traits::Stre auto currPDE = startPDE; auto physPage = BaseClass::getPTEAddress(startPTE) & g_pageMask; while (currPDE <= endPDE) { - auto pde = physPage | OCLRT::AubHelper::getPTEntryBits(additionalBits); + auto pde = physPage | NEO::AubHelper::getPTEntryBits(additionalBits); stream.writePTE(startAddress, pde, addressSpace); startAddress += sizeof(pde); diff --git a/runtime/built_ins/aux_translation_builtin.h b/runtime/built_ins/aux_translation_builtin.h index be8203538f..d668140016 100644 --- a/runtime/built_ins/aux_translation_builtin.h +++ b/runtime/built_ins/aux_translation_builtin.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { template class BuiltInOp : public BuiltinDispatchInfoBuilder { public: @@ -27,4 +27,4 @@ class BuiltInOp : public BuiltinDispatchI mutable std::vector> convertToAuxKernel; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/built_ins.cpp b/runtime/built_ins/built_ins.cpp index 9653a91da8..fe9360349e 100644 --- a/runtime/built_ins/built_ins.cpp +++ b/runtime/built_ins/built_ins.cpp @@ -24,7 +24,7 @@ #include #include -namespace OCLRT { +namespace NEO { const char *mediaKernelsBuildOptions = { "-D cl_intel_device_side_advanced_vme_enable " @@ -822,4 +822,4 @@ void BuiltInOwnershipWrapper::takeOwnership(BuiltinDispatchInfoBuilder &inputBui } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/built_ins.h b/runtime/built_ins/built_ins.h index 5c330b2590..7fb35eb095 100644 --- a/runtime/built_ins/built_ins.h +++ b/runtime/built_ins/built_ins.h @@ -23,7 +23,7 @@ #include #include -namespace OCLRT { +namespace NEO { typedef std::vector BuiltinResourceT; class Context; @@ -235,4 +235,4 @@ class BuiltInOwnershipWrapper : public NonCopyableOrMovableClass { template class BuiltInOp; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/built_ins.inl b/runtime/built_ins/built_ins.inl index d33fec7278..9f3b4d0004 100644 --- a/runtime/built_ins/built_ins.inl +++ b/runtime/built_ins/built_ins.inl @@ -9,7 +9,7 @@ #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" -namespace OCLRT { +namespace NEO { template void BuiltinDispatchInfoBuilder::populate(Context &context, Device &device, EBuiltInOps op, const char *options, KernelsDescArgsT &&... desc) { auto src = kernelsLib.getBuiltinsLib().getBuiltinCode(op, BuiltinCode::ECodeType::Any, device); @@ -74,4 +74,4 @@ void BuiltInOp::resizeKernelInstances(siz } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/built_ins_storage.cpp b/runtime/built_ins/built_ins_storage.cpp index 782d0b4537..c57debf8b6 100644 --- a/runtime/built_ins/built_ins_storage.cpp +++ b/runtime/built_ins/built_ins_storage.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { const char *getBuiltinAsString(EBuiltInOps builtin) { switch (builtin) { @@ -210,4 +210,4 @@ BuiltinResourceT BuiltinsLib::getBuiltinResource(EBuiltInOps builtin, BuiltinCod return bc; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/builtins_dispatch_builder.h b/runtime/built_ins/builtins_dispatch_builder.h index 2ee784f68d..4d4dec813a 100644 --- a/runtime/built_ins/builtins_dispatch_builder.h +++ b/runtime/built_ins/builtins_dispatch_builder.h @@ -21,7 +21,7 @@ #include #include -namespace OCLRT { +namespace NEO { typedef std::vector BuiltinResourceT; class Context; @@ -99,4 +99,4 @@ class BuiltinDispatchInfoBuilder { BuiltIns &kernelsLib; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/registry/built_ins_registry.h b/runtime/built_ins/registry/built_ins_registry.h index 3b21950264..d04130a14b 100644 --- a/runtime/built_ins/registry/built_ins_registry.h +++ b/runtime/built_ins/registry/built_ins_registry.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct RegisterEmbeddedResource { RegisterEmbeddedResource(const char *name, const char *resource, size_t resourceLength) { @@ -25,4 +25,4 @@ struct RegisterEmbeddedResource { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/registry/register_copy_kernels_source.cpp b/runtime/built_ins/registry/register_copy_kernels_source.cpp index cc20571c6c..8d625f4983 100644 --- a/runtime/built_ins/registry/register_copy_kernels_source.cpp +++ b/runtime/built_ins/registry/register_copy_kernels_source.cpp @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { static RegisterEmbeddedResource registerCopyBufferToBufferSrc( createBuiltinResourceName( @@ -119,4 +119,4 @@ static RegisterEmbeddedResource registerAuxTranslationSrc( #include "runtime/built_ins/kernels/aux_translation.igdrcl_built_in" )); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/registry/register_ext_vme_source.cpp b/runtime/built_ins/registry/register_ext_vme_source.cpp index d146842bec..a9e3dec7c8 100644 --- a/runtime/built_ins/registry/register_ext_vme_source.cpp +++ b/runtime/built_ins/registry/register_ext_vme_source.cpp @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { static RegisterEmbeddedResource registerVmeSrc( createBuiltinResourceName( @@ -38,4 +38,4 @@ static RegisterEmbeddedResource registerVmeAdvancedBidirectionalSrc( #include "runtime/built_ins/kernels/vme_block_advanced_motion_estimate_bidirectional_check_intel.igdrcl_built_in" )); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/sip.cpp b/runtime/built_ins/sip.cpp index 2b8c35ca25..fa70aa3d82 100644 --- a/runtime/built_ins/sip.cpp +++ b/runtime/built_ins/sip.cpp @@ -15,7 +15,7 @@ #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { const size_t SipKernel::maxDbgSurfaceSize = 0x49c000; // proper value should be taken from compiler when it's ready @@ -89,4 +89,4 @@ SipKernelType SipKernel::getSipKernelType(GFXCORE_FAMILY family, bool debuggingA auto &hwHelper = HwHelper::get(family); return hwHelper.getSipKernelType(debuggingActive); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/sip.h b/runtime/built_ins/sip.h index f2ae6066b0..0660b62c01 100644 --- a/runtime/built_ins/sip.h +++ b/runtime/built_ins/sip.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Device; class Program; @@ -54,4 +54,4 @@ class SipKernel { SipKernelType type = SipKernelType::COUNT; Program *program = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/built_ins/vme_dispatch_builder.h b/runtime/built_ins/vme_dispatch_builder.h index d4bbef0942..d889d2acdf 100644 --- a/runtime/built_ins/vme_dispatch_builder.h +++ b/runtime/built_ins/vme_dispatch_builder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -namespace OCLRT { +namespace NEO { template class VmeBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder { public: @@ -475,4 +475,4 @@ class BuiltInOp using namespace std; -using namespace OCLRT; +using namespace NEO; namespace BuiltinKernelsSimulation { diff --git a/runtime/builtin_kernels_simulation/scheduler_simulation.h b/runtime/builtin_kernels_simulation/scheduler_simulation.h index 731898748e..2f40aacf1d 100644 --- a/runtime/builtin_kernels_simulation/scheduler_simulation.h +++ b/runtime/builtin_kernels_simulation/scheduler_simulation.h @@ -10,7 +10,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; } @@ -22,38 +22,38 @@ extern std::thread threads[]; template class SchedulerSimulation { public: - void runSchedulerSimulation(OCLRT::GraphicsAllocation *queue, - OCLRT::GraphicsAllocation *commandsStack, - OCLRT::GraphicsAllocation *eventsPool, - OCLRT::GraphicsAllocation *secondaryBatchBuffer, - OCLRT::GraphicsAllocation *dsh, - OCLRT::GraphicsAllocation *reflectionSurface, - OCLRT::GraphicsAllocation *queueStorageBuffer, - OCLRT::GraphicsAllocation *ssh, - OCLRT::GraphicsAllocation *debugQueue); + void runSchedulerSimulation(NEO::GraphicsAllocation *queue, + NEO::GraphicsAllocation *commandsStack, + NEO::GraphicsAllocation *eventsPool, + NEO::GraphicsAllocation *secondaryBatchBuffer, + NEO::GraphicsAllocation *dsh, + NEO::GraphicsAllocation *reflectionSurface, + NEO::GraphicsAllocation *queueStorageBuffer, + NEO::GraphicsAllocation *ssh, + NEO::GraphicsAllocation *debugQueue); void cleanSchedulerSimulation(); static void startScheduler(uint32_t index, - OCLRT::GraphicsAllocation *queue, - OCLRT::GraphicsAllocation *commandsStack, - OCLRT::GraphicsAllocation *eventsPool, - OCLRT::GraphicsAllocation *secondaryBatchBuffer, - OCLRT::GraphicsAllocation *dsh, - OCLRT::GraphicsAllocation *reflectionSurface, - OCLRT::GraphicsAllocation *queueStorageBuffer, - OCLRT::GraphicsAllocation *ssh, - OCLRT::GraphicsAllocation *debugQueue); + NEO::GraphicsAllocation *queue, + NEO::GraphicsAllocation *commandsStack, + NEO::GraphicsAllocation *eventsPool, + NEO::GraphicsAllocation *secondaryBatchBuffer, + NEO::GraphicsAllocation *dsh, + NEO::GraphicsAllocation *reflectionSurface, + NEO::GraphicsAllocation *queueStorageBuffer, + NEO::GraphicsAllocation *ssh, + NEO::GraphicsAllocation *debugQueue); - void initializeSchedulerSimulation(OCLRT::GraphicsAllocation *queue, - OCLRT::GraphicsAllocation *commandsStack, - OCLRT::GraphicsAllocation *eventsPool, - OCLRT::GraphicsAllocation *secondaryBatchBuffer, - OCLRT::GraphicsAllocation *dsh, - OCLRT::GraphicsAllocation *reflectionSurface, - OCLRT::GraphicsAllocation *queueStorageBuffer, - OCLRT::GraphicsAllocation *ssh, - OCLRT::GraphicsAllocation *debugQueue); + void initializeSchedulerSimulation(NEO::GraphicsAllocation *queue, + NEO::GraphicsAllocation *commandsStack, + NEO::GraphicsAllocation *eventsPool, + NEO::GraphicsAllocation *secondaryBatchBuffer, + NEO::GraphicsAllocation *dsh, + NEO::GraphicsAllocation *reflectionSurface, + NEO::GraphicsAllocation *queueStorageBuffer, + NEO::GraphicsAllocation *ssh, + NEO::GraphicsAllocation *debugQueue); static void patchGpGpuWalker(uint secondLevelBatchOffset, __global uint *secondaryBatchBuffer, diff --git a/runtime/builtin_kernels_simulation/scheduler_simulation.inl b/runtime/builtin_kernels_simulation/scheduler_simulation.inl index f9e58b03ef..608ffc481e 100644 --- a/runtime/builtin_kernels_simulation/scheduler_simulation.inl +++ b/runtime/builtin_kernels_simulation/scheduler_simulation.inl @@ -13,7 +13,7 @@ #include using namespace std; -using namespace OCLRT; +using namespace NEO; namespace BuiltinKernelsSimulation { diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp index 8dce178d35..ff4ab6333d 100644 --- a/runtime/command_queue/command_queue.cpp +++ b/runtime/command_queue/command_queue.cpp @@ -37,7 +37,7 @@ #include -namespace OCLRT { +namespace NEO { // Global table of create functions CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE] = {}; @@ -566,4 +566,4 @@ size_t CommandQueue::estimateTimestampPacketNodesCount(const MultiDispatchInfo & } return nodesCount; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/command_queue.h b/runtime/command_queue/command_queue.h index 452b9d2ee1..9f754d1f34 100644 --- a/runtime/command_queue/command_queue.h +++ b/runtime/command_queue/command_queue.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Buffer; class LinearStream; class Context; @@ -481,4 +481,4 @@ LinearStream &getCommandStream(CommandQueue &commandQueue, template IndirectHeap &getIndirectHeap(CommandQueue &commandQueue, const Kernel &kernel); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/command_queue_hw.h b/runtime/command_queue/command_queue_hw.h index 8cc6f5555b..c5c2358ea6 100644 --- a/runtime/command_queue/command_queue_hw.h +++ b/runtime/command_queue/command_queue_hw.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { class EventBuilder; @@ -345,7 +345,7 @@ class CommandQueueHw : public CommandQueue { private: bool isTaskLevelUpdateRequired(const uint32_t &taskLevel, const cl_event *eventWaitList, const cl_uint &numEventsInWaitList, unsigned int commandType); void obtainTaskLevelAndBlockedStatus(unsigned int &taskLevel, cl_uint &numEventsInWaitList, const cl_event *&eventWaitList, bool &blockQueue, unsigned int commandType) override; - void forceDispatchScheduler(OCLRT::MultiDispatchInfo &multiDispatchInfo); + void forceDispatchScheduler(NEO::MultiDispatchInfo &multiDispatchInfo); static void computeOffsetsValueForRectCommands(size_t *bufferOffset, size_t *hostOffset, const size_t *bufferOrigin, @@ -366,7 +366,7 @@ class CommandQueueHw : public CommandQueue { void processDispatchForKernels(const MultiDispatchInfo &multiDispatchInfo, std::unique_ptr &printfHandler, Event *event, - TagNode *&hwTimeStamps, + TagNode *&hwTimeStamps, Kernel *parentKernel, bool blockQueue, DeviceQueueHw *devQueueHw, @@ -375,4 +375,4 @@ class CommandQueueHw : public CommandQueue { TimestampPacketContainer &previousTimestampPacketNodes, PreemptionMode preemption); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/command_queue_hw.inl b/runtime/command_queue/command_queue_hw.inl index 65c1138e9a..768cd3d4df 100644 --- a/runtime/command_queue/command_queue_hw.inl +++ b/runtime/command_queue/command_queue_hw.inl @@ -27,7 +27,7 @@ #include "runtime/command_queue/flush.h" #include "runtime/command_queue/gpgpu_walker.h" -namespace OCLRT { +namespace NEO { template void CommandQueueHw::notifyEnqueueReadBuffer(Buffer *buffer, bool blockingRead) { if (DebugManager.flags.AUBDumpAllocsOnEnqueueReadOnly.get()) { @@ -45,4 +45,4 @@ template bool CommandQueueHw::requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties) { return false; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/cpu_data_transfer_handler.cpp b/runtime/command_queue/cpu_data_transfer_handler.cpp index e488858433..c4ac0e65be 100644 --- a/runtime/command_queue/cpu_data_transfer_handler.cpp +++ b/runtime/command_queue/cpu_data_transfer_handler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" -namespace OCLRT { +namespace NEO { void *CommandQueue::cpuDataTransferHandler(TransferProperties &transferProperties, EventsRequest &eventsRequest, cl_int &retVal) { MapInfo unmapInfo; Event *outEventObj = nullptr; @@ -190,4 +190,4 @@ void CommandQueue::providePerformanceHint(TransferProperties &transferProperties context->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_BAD_INTEL, CL_ENQUEUE_WRITE_BUFFER_REQUIRES_COPY_DATA, static_cast(transferProperties.memObj), transferProperties.ptr); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_barrier.h b/runtime/command_queue/enqueue_barrier.h index c684f60e81..3818198e85 100644 --- a/runtime/command_queue/enqueue_barrier.h +++ b/runtime/command_queue/enqueue_barrier.h @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueBarrierWithWaitList( @@ -33,4 +33,4 @@ cl_int CommandQueueHw::enqueueBarrierWithWaitList( event); return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index 4db171334e..4022c2bde4 100644 --- a/runtime/command_queue/enqueue_common.h +++ b/runtime/command_queue/enqueue_common.h @@ -37,7 +37,7 @@ #include #include -namespace OCLRT { +namespace NEO { template template @@ -98,7 +98,7 @@ void CommandQueueHw::enqueueHandler(Surface *(&surfaces)[surfaceCount } template -void CommandQueueHw::forceDispatchScheduler(OCLRT::MultiDispatchInfo &multiDispatchInfo) { +void CommandQueueHw::forceDispatchScheduler(NEO::MultiDispatchInfo &multiDispatchInfo) { BuiltIns &builtIns = *getDevice().getExecutionEnvironment()->getBuiltIns(); SchedulerKernel &scheduler = builtIns.getSchedulerKernel(this->getContext()); DispatchInfo dispatchInfo(&scheduler, 1, Vec3(scheduler.getGws(), 1, 1), Vec3(scheduler.getLws(), 1, 1), Vec3(0, 0, 0)); @@ -780,4 +780,4 @@ size_t CommandQueueHw::calculateHostPtrSizeForImage(const size_t *reg return Image::calculateHostPtrSize(region, dstRowPitch, dstSlicePitch, bytesPerPixel, image->getImageDesc().image_type); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_copy_buffer.h b/runtime/command_queue/enqueue_copy_buffer.h index 42de57c897..ec9e835676 100644 --- a/runtime/command_queue/enqueue_copy_buffer.h +++ b/runtime/command_queue/enqueue_copy_buffer.h @@ -18,7 +18,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueCopyBuffer( @@ -59,4 +59,4 @@ cl_int CommandQueueHw::enqueueCopyBuffer( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_copy_buffer_rect.h b/runtime/command_queue/enqueue_copy_buffer_rect.h index 3e0ae3f557..cf4dc4b72c 100644 --- a/runtime/command_queue/enqueue_copy_buffer_rect.h +++ b/runtime/command_queue/enqueue_copy_buffer_rect.h @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueCopyBufferRect( @@ -64,4 +64,4 @@ cl_int CommandQueueHw::enqueueCopyBufferRect( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_copy_buffer_to_image.h b/runtime/command_queue/enqueue_copy_buffer_to_image.h index 2aa919512a..9657a0a81b 100644 --- a/runtime/command_queue/enqueue_copy_buffer_to_image.h +++ b/runtime/command_queue/enqueue_copy_buffer_to_image.h @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueCopyBufferToImage( @@ -64,4 +64,4 @@ cl_int CommandQueueHw::enqueueCopyBufferToImage( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_copy_image.h b/runtime/command_queue/enqueue_copy_image.h index 720607a00f..147f0423c0 100644 --- a/runtime/command_queue/enqueue_copy_image.h +++ b/runtime/command_queue/enqueue_copy_image.h @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueCopyImage( @@ -67,4 +67,4 @@ cl_int CommandQueueHw::enqueueCopyImage( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_copy_image_to_buffer.h b/runtime/command_queue/enqueue_copy_image_to_buffer.h index 481a5abe92..3041bd9bb5 100644 --- a/runtime/command_queue/enqueue_copy_image_to_buffer.h +++ b/runtime/command_queue/enqueue_copy_image_to_buffer.h @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueCopyImageToBuffer( @@ -64,4 +64,4 @@ cl_int CommandQueueHw::enqueueCopyImageToBuffer( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_fill_buffer.h b/runtime/command_queue/enqueue_fill_buffer.h index eb3f5daf33..4d06974572 100644 --- a/runtime/command_queue/enqueue_fill_buffer.h +++ b/runtime/command_queue/enqueue_fill_buffer.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueFillBuffer( @@ -79,4 +79,4 @@ cl_int CommandQueueHw::enqueueFillBuffer( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_fill_image.h b/runtime/command_queue/enqueue_fill_image.h index f4eb3aa01e..6a7debecf7 100644 --- a/runtime/command_queue/enqueue_fill_image.h +++ b/runtime/command_queue/enqueue_fill_image.h @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueFillImage( @@ -59,4 +59,4 @@ cl_int CommandQueueHw::enqueueFillImage( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_kernel.h b/runtime/command_queue/enqueue_kernel.h index 70a3d1d372..52b564645b 100644 --- a/runtime/command_queue/enqueue_kernel.h +++ b/runtime/command_queue/enqueue_kernel.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueKernel( @@ -143,4 +143,4 @@ cl_int CommandQueueHw::enqueueKernel( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_marker.h b/runtime/command_queue/enqueue_marker.h index 6aef656c64..026c151289 100644 --- a/runtime/command_queue/enqueue_marker.h +++ b/runtime/command_queue/enqueue_marker.h @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueMarkerWithWaitList( @@ -35,4 +35,4 @@ cl_int CommandQueueHw::enqueueMarkerWithWaitList( event); return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_migrate_mem_objects.h b/runtime/command_queue/enqueue_migrate_mem_objects.h index 1f4d9f9520..ff5f940f27 100644 --- a/runtime/command_queue/enqueue_migrate_mem_objects.h +++ b/runtime/command_queue/enqueue_migrate_mem_objects.h @@ -15,7 +15,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueMigrateMemObjects(cl_uint numMemObjects, @@ -36,4 +36,4 @@ cl_int CommandQueueHw::enqueueMigrateMemObjects(cl_uint numMemObjects return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_read_buffer.h b/runtime/command_queue/enqueue_read_buffer.h index 8c7bc569a2..2208d9cc1e 100644 --- a/runtime/command_queue/enqueue_read_buffer.h +++ b/runtime/command_queue/enqueue_read_buffer.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueReadBuffer( @@ -125,4 +125,4 @@ cl_int CommandQueueHw::enqueueReadBuffer( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_read_buffer_rect.h b/runtime/command_queue/enqueue_read_buffer_rect.h index b23f06aec9..013e521489 100644 --- a/runtime/command_queue/enqueue_read_buffer_rect.h +++ b/runtime/command_queue/enqueue_read_buffer_rect.h @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueReadBufferRect( @@ -117,4 +117,4 @@ cl_int CommandQueueHw::enqueueReadBufferRect( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_read_image.h b/runtime/command_queue/enqueue_read_image.h index dcca12e144..4ef2f07168 100644 --- a/runtime/command_queue/enqueue_read_image.h +++ b/runtime/command_queue/enqueue_read_image.h @@ -24,7 +24,7 @@ #include #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueReadImage( @@ -124,4 +124,4 @@ cl_int CommandQueueHw::enqueueReadImage( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_svm.h b/runtime/command_queue/enqueue_svm.h index 52dff4fe08..bba98139e2 100644 --- a/runtime/command_queue/enqueue_svm.h +++ b/runtime/command_queue/enqueue_svm.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { using SvmFreeClbT = void(CL_CALLBACK *)(cl_command_queue queue, cl_uint numSvmPointers, @@ -67,7 +67,7 @@ cl_int CommandQueueHw::enqueueSVMMap(cl_bool blockingMap, const cl_event *eventWaitList, cl_event *event) { - OCLRT::GraphicsAllocation *svmAllocation = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); + NEO::GraphicsAllocation *svmAllocation = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); if (svmAllocation == nullptr) { return CL_INVALID_VALUE; } @@ -94,7 +94,7 @@ cl_int CommandQueueHw::enqueueSVMUnmap(void *svmPtr, const cl_event *eventWaitList, cl_event *event) { - OCLRT::GraphicsAllocation *svmAllocation = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); + NEO::GraphicsAllocation *svmAllocation = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); if (svmAllocation == nullptr) { return CL_INVALID_VALUE; } @@ -203,7 +203,7 @@ cl_int CommandQueueHw::enqueueSVMMemFill(void *svmPtr, const cl_event *eventWaitList, cl_event *event) { - OCLRT::GraphicsAllocation *pSvmAlloc = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); + NEO::GraphicsAllocation *pSvmAlloc = context->getSVMAllocsManager()->getSVMAlloc(svmPtr); if (pSvmAlloc == nullptr) { return CL_INVALID_VALUE; } @@ -285,4 +285,4 @@ cl_int CommandQueueHw::enqueueSVMMigrateMem(cl_uint numSvmPointers, return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_write_buffer.h b/runtime/command_queue/enqueue_write_buffer.h index 7219eabcbf..d5a0363a08 100644 --- a/runtime/command_queue/enqueue_write_buffer.h +++ b/runtime/command_queue/enqueue_write_buffer.h @@ -18,7 +18,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueWriteBuffer( @@ -123,4 +123,4 @@ cl_int CommandQueueHw::enqueueWriteBuffer( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_write_buffer_rect.h b/runtime/command_queue/enqueue_write_buffer_rect.h index 92d99a1107..1d520a14a2 100644 --- a/runtime/command_queue/enqueue_write_buffer_rect.h +++ b/runtime/command_queue/enqueue_write_buffer_rect.h @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueWriteBufferRect( @@ -113,4 +113,4 @@ cl_int CommandQueueHw::enqueueWriteBufferRect( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/enqueue_write_image.h b/runtime/command_queue/enqueue_write_image.h index daf91a47f1..188da4f0c0 100644 --- a/runtime/command_queue/enqueue_write_image.h +++ b/runtime/command_queue/enqueue_write_image.h @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::enqueueWriteImage( @@ -116,4 +116,4 @@ cl_int CommandQueueHw::enqueueWriteImage( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/finish.h b/runtime/command_queue/finish.h index d29cffdadc..7aa78f55e0 100644 --- a/runtime/command_queue/finish.h +++ b/runtime/command_queue/finish.h @@ -12,7 +12,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::finish(bool dcFlush) { @@ -32,4 +32,4 @@ cl_int CommandQueueHw::finish(bool dcFlush) { return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/flush.h b/runtime/command_queue/flush.h index 86b2d16275..b869eeb602 100644 --- a/runtime/command_queue/flush.h +++ b/runtime/command_queue/flush.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #pragma once -namespace OCLRT { +namespace NEO { template cl_int CommandQueueHw::flush() { getCommandStreamReceiver().flushBatchedSubmissions(); return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/gpgpu_walker.h b/runtime/command_queue/gpgpu_walker.h index 4c16b65bfc..5cef3eda59 100644 --- a/runtime/command_queue/gpgpu_walker.h +++ b/runtime/command_queue/gpgpu_walker.h @@ -25,7 +25,7 @@ #include "runtime/utilities/tag_allocator.h" #include "runtime/utilities/vec.h" -namespace OCLRT { +namespace NEO { template using WALKER_TYPE = typename GfxFamily::WALKER_TYPE; @@ -143,50 +143,50 @@ class GpgpuWalkerHelper { static void dispatchProfilingCommandsStart( TagNode &hwTimeStamps, - OCLRT::LinearStream *commandStream); + NEO::LinearStream *commandStream); static void dispatchProfilingCommandsEnd( TagNode &hwTimeStamps, - OCLRT::LinearStream *commandStream); + NEO::LinearStream *commandStream); static void dispatchPerfCountersNoopidRegisterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start); static void dispatchPerfCountersReadFreqRegisterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start); static void dispatchPerfCountersGeneralPurposeCounterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start); static void dispatchPerfCountersUserCounterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start); static void dispatchPerfCountersOABufferStateCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream); + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream); static void dispatchPerfCountersCommandsStart( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream); + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream); static void dispatchPerfCountersCommandsEnd( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream); + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream); static void setupTimestampPacket( LinearStream *cmdStream, @@ -260,4 +260,4 @@ IndirectHeap &getIndirectHeap(CommandQueue &commandQueue, const MultiDispatchInf return *ih; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/gpgpu_walker.inl b/runtime/command_queue/gpgpu_walker.inl index c341cd5285..ea7e5589e3 100644 --- a/runtime/command_queue/gpgpu_walker.inl +++ b/runtime/command_queue/gpgpu_walker.inl @@ -28,12 +28,12 @@ #include #include -namespace OCLRT { +namespace NEO { // Performs ReadModifyWrite operation on value of a register: Register = Register Operation Mask template void GpgpuWalkerHelper::addAluReadModifyWriteRegister( - OCLRT::LinearStream *pCommandStream, + NEO::LinearStream *pCommandStream, uint32_t aluRegister, uint32_t operation, uint32_t mask) { @@ -105,7 +105,7 @@ void GpgpuWalkerHelper::addAluReadModifyWriteRegister( template void GpgpuWalkerHelper::dispatchProfilingCommandsStart( TagNode &hwTimeStamps, - OCLRT::LinearStream *commandStream) { + NEO::LinearStream *commandStream) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; // PIPE_CONTROL for global timestamp @@ -129,7 +129,7 @@ void GpgpuWalkerHelper::dispatchProfilingCommandsStart( template void GpgpuWalkerHelper::dispatchProfilingCommandsEnd( TagNode &hwTimeStamps, - OCLRT::LinearStream *commandStream) { + NEO::LinearStream *commandStream) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -153,8 +153,8 @@ void GpgpuWalkerHelper::dispatchProfilingCommandsEnd( template void GpgpuWalkerHelper::dispatchPerfCountersNoopidRegisterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -164,15 +164,15 @@ void GpgpuWalkerHelper::dispatchPerfCountersNoopidRegisterCommands( auto pNoopIdRegister = (MI_STORE_REGISTER_MEM *)commandStream->getSpace(sizeof(MI_STORE_REGISTER_MEM)); *pNoopIdRegister = GfxFamily::cmdInitStoreRegisterMem; - pNoopIdRegister->setRegisterAddress(OCLRT::INSTR_MMIO_NOOPID); + pNoopIdRegister->setRegisterAddress(NEO::INSTR_MMIO_NOOPID); pNoopIdRegister->setMemoryAddress(address); } template void GpgpuWalkerHelper::dispatchPerfCountersReadFreqRegisterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -182,15 +182,15 @@ void GpgpuWalkerHelper::dispatchPerfCountersReadFreqRegisterCommands( auto pCoreFreqRegister = (MI_STORE_REGISTER_MEM *)commandStream->getSpace(sizeof(MI_STORE_REGISTER_MEM)); *pCoreFreqRegister = GfxFamily::cmdInitStoreRegisterMem; - pCoreFreqRegister->setRegisterAddress(OCLRT::INSTR_MMIO_RPSTAT1); + pCoreFreqRegister->setRegisterAddress(NEO::INSTR_MMIO_RPSTAT1); pCoreFreqRegister->setMemoryAddress(address); } template void GpgpuWalkerHelper::dispatchPerfCountersGeneralPurposeCounterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -199,7 +199,7 @@ void GpgpuWalkerHelper::dispatchPerfCountersGeneralPurposeCounterComm : reinterpret_cast(&(hwPerfCounter.HWPerfCounters.HwPerfReportEnd.Gp)); // Read General Purpose counters - for (uint16_t i = 0; i < OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT; i++) { + for (uint16_t i = 0; i < NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT; i++) { auto pGeneralPurposeRegister = (MI_STORE_REGISTER_MEM *)commandStream->getSpace(sizeof(MI_STORE_REGISTER_MEM)); *pGeneralPurposeRegister = GfxFamily::cmdInitStoreRegisterMem; uint32_t regAddr = INSTR_GFX_OFFSETS::INSTR_PERF_CNT_1_DW0 + i * sizeof(cl_uint); @@ -213,8 +213,8 @@ void GpgpuWalkerHelper::dispatchPerfCountersGeneralPurposeCounterComm template void GpgpuWalkerHelper::dispatchPerfCountersUserCounterCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream, + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream, bool start) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -254,8 +254,8 @@ void GpgpuWalkerHelper::dispatchPerfCountersUserCounterCommands( template void GpgpuWalkerHelper::dispatchPerfCountersOABufferStateCommands( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream) { + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; @@ -285,8 +285,8 @@ void GpgpuWalkerHelper::dispatchPerfCountersOABufferStateCommands( template void GpgpuWalkerHelper::dispatchPerfCountersCommandsStart( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream) { + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; using MI_REPORT_PERF_COUNT = typename GfxFamily::MI_REPORT_PERF_COUNT; @@ -326,8 +326,8 @@ void GpgpuWalkerHelper::dispatchPerfCountersCommandsStart( template void GpgpuWalkerHelper::dispatchPerfCountersCommandsEnd( CommandQueue &commandQueue, - OCLRT::HwPerfCounter &hwPerfCounter, - OCLRT::LinearStream *commandStream) { + NEO::HwPerfCounter &hwPerfCounter, + NEO::LinearStream *commandStream) { using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM; using MI_REPORT_PERF_COUNT = typename GfxFamily::MI_REPORT_PERF_COUNT; @@ -368,7 +368,7 @@ void GpgpuWalkerHelper::dispatchPerfCountersCommandsEnd( } template -void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(OCLRT::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { +void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { } template @@ -429,7 +429,7 @@ size_t EnqueueOperation::getSizeRequiredCSKernel(bool reserveProfilin //SRM NOOPID & Frequency size += 2 * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); //gp registers - size += OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); + size += NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); //report perf count size += sizeof(typename GfxFamily::MI_REPORT_PERF_COUNT); //user registers @@ -443,7 +443,7 @@ size_t EnqueueOperation::getSizeRequiredCSKernel(bool reserveProfilin //report perf count size += sizeof(typename GfxFamily::MI_REPORT_PERF_COUNT); //gp registers - size += OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); + size += NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); //SRM NOOPID & Frequency size += 2 * sizeof(typename GfxFamily::MI_STORE_REGISTER_MEM); //user registers @@ -468,4 +468,4 @@ size_t EnqueueOperation::getSizeRequiredForTimestampPacketWrite() { return sizeof(PIPE_CONTROL); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/gpgpu_walker_base.inl b/runtime/command_queue/gpgpu_walker_base.inl index 8f27c2ab51..95ac3f264d 100644 --- a/runtime/command_queue/gpgpu_walker_base.inl +++ b/runtime/command_queue/gpgpu_walker_base.inl @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_queue/gpgpu_walker.h" -namespace OCLRT { +namespace NEO { template inline size_t GpgpuWalkerHelper::setGpgpuWalkerThreadData( @@ -181,4 +181,4 @@ void GpgpuWalkerHelper::setupTimestampPacket( } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/hardware_interface.h b/runtime/command_queue/hardware_interface.h index 51395304ca..da19d85082 100644 --- a/runtime/command_queue/hardware_interface.h +++ b/runtime/command_queue/hardware_interface.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { class CommandQueue; class DispatchInfo; @@ -100,4 +100,4 @@ class HardwareInterface { const Kernel &kernel); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/hardware_interface.inl b/runtime/command_queue/hardware_interface.inl index 95f07d0517..a314127ff2 100644 --- a/runtime/command_queue/hardware_interface.inl +++ b/runtime/command_queue/hardware_interface.inl @@ -11,7 +11,7 @@ #include "runtime/helpers/task_information.h" #include "runtime/memory_manager/internal_allocation_storage.h" -namespace OCLRT { +namespace NEO { template inline WALKER_TYPE *HardwareInterface::allocateWalkerSpace(LinearStream &commandStream, @@ -224,4 +224,4 @@ void HardwareInterface::dispatchWalker( dispatchProfilingPerfEndCommands(hwTimeStamps, hwPerfCounter, commandStream, commandQueue); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/hardware_interface_base.inl b/runtime/command_queue/hardware_interface_base.inl index f969a88724..02abea4cfc 100644 --- a/runtime/command_queue/hardware_interface_base.inl +++ b/runtime/command_queue/hardware_interface_base.inl @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_queue/hardware_interface.h" -namespace OCLRT { +namespace NEO { template inline void HardwareInterface::getDefaultDshSpace( @@ -137,4 +137,4 @@ inline void HardwareInterface::programWalker( *kernel.getKernelInfo().patchInfo.threadPayload); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/local_id_gen.cpp b/runtime/command_queue/local_id_gen.cpp index 6b9e8c52b8..ef95cd5eea 100644 --- a/runtime/command_queue/local_id_gen.cpp +++ b/runtime/command_queue/local_id_gen.cpp @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { struct uint16x8_t; struct uint16x16_t; @@ -114,4 +114,4 @@ inline void generateLocalIDsWithLayoutForImages(void *b, const std::array #include -namespace OCLRT { +namespace NEO { union GRF { float fRegs[8]; uint32_t dwRegs[8]; @@ -68,4 +68,4 @@ void generateLocalIDs(void *buffer, uint16_t simd, const std::array void generateLocalIDsWithLayoutForImages(void *b, const std::array &localWorkgroupSize, uint16_t simd); bool isCompatibleWithLayoutForImages(const std::array &localWorkgroupSize, const std::array &dimensionsOrder, uint16_t simd); -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/command_queue/local_id_gen.inl b/runtime/command_queue/local_id_gen.inl index 53d202b1d5..f45e7470c0 100644 --- a/runtime/command_queue/local_id_gen.inl +++ b/runtime/command_queue/local_id_gen.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { template inline void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, @@ -149,4 +149,4 @@ inline void generateLocalIDsSimd(void *b, const std::array &localWo } while (++pass < passes); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/local_id_gen_avx2.cpp b/runtime/command_queue/local_id_gen_avx2.cpp index 711f1def03..9cb09ef4ac 100644 --- a/runtime/command_queue/local_id_gen_avx2.cpp +++ b/runtime/command_queue/local_id_gen_avx2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,8 +11,8 @@ #include -namespace OCLRT { +namespace NEO { template void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array &dimensionsOrder); template void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array &dimensionsOrder); -} // namespace OCLRT +} // namespace NEO #endif \ No newline at end of file diff --git a/runtime/command_queue/local_id_gen_sse4.cpp b/runtime/command_queue/local_id_gen_sse4.cpp index 149e478164..98dad3f119 100644 --- a/runtime/command_queue/local_id_gen_sse4.cpp +++ b/runtime/command_queue/local_id_gen_sse4.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,8 +10,8 @@ #include -namespace OCLRT { +namespace NEO { template void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array &dimensionsOrder); template void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array &dimensionsOrder); template void generateLocalIDsSimd(void *b, const std::array &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array &dimensionsOrder); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_queue/local_work_size.cpp b/runtime/command_queue/local_work_size.cpp index bca9725acc..160ef13085 100644 --- a/runtime/command_queue/local_work_size.cpp +++ b/runtime/command_queue/local_work_size.cpp @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { //threshold used to determine what kind of device is underneath //big cores like SKL have 8EU * 7 HW threads per subslice and are considered as highThreadCount devices @@ -473,4 +473,4 @@ void provideLocalWorkGroupSizeHints(Context *context, uint32_t maxWorkGroupSize, } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/aub_command_stream_receiver.cpp b/runtime/command_stream/aub_command_stream_receiver.cpp index 60d402f5c0..a007204eea 100644 --- a/runtime/command_stream/aub_command_stream_receiver.cpp +++ b/runtime/command_stream/aub_command_stream_receiver.cpp @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { AubCommandStreamReceiverCreateFunc aubCommandStreamReceiverFactory[IGFX_MAX_CORE] = {}; std::string AUBCommandStreamReceiver::createFullFilePath(const HardwareInfo &hwInfo, const std::string &filename) { @@ -58,7 +58,7 @@ CommandStreamReceiver *AUBCommandStreamReceiver::create(const std::string &baseN auto pCreate = aubCommandStreamReceiverFactory[hwInfo->pPlatform->eRenderCoreFamily]; return pCreate ? pCreate(filePath, standalone, executionEnvironment) : nullptr; } -} // namespace OCLRT +} // namespace NEO namespace AubMemDump { using CmdServicesMemTraceMemoryCompare = AubMemDump::CmdServicesMemTraceMemoryCompare; diff --git a/runtime/command_stream/aub_command_stream_receiver.h b/runtime/command_stream/aub_command_stream_receiver.h index 58f2418168..24caa0149d 100644 --- a/runtime/command_stream/aub_command_stream_receiver.h +++ b/runtime/command_stream/aub_command_stream_receiver.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class CommandStreamReceiver; class ExecutionEnvironment; @@ -23,4 +23,4 @@ struct AUBCommandStreamReceiver { }; typedef CommandStreamReceiver *(*AubCommandStreamReceiverCreateFunc)(const std::string &fileName, bool standalone, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/aub_command_stream_receiver_hw.h b/runtime/command_stream/aub_command_stream_receiver_hw.h index bda735e091..953d4ddd5e 100644 --- a/runtime/command_stream/aub_command_stream_receiver_hw.h +++ b/runtime/command_stream/aub_command_stream_receiver_hw.h @@ -17,7 +17,7 @@ #include "command_stream_receiver_simulated_hw.h" -namespace OCLRT { +namespace NEO { class AubSubCaptureManager; @@ -113,4 +113,4 @@ class AUBCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw #include -namespace OCLRT { +namespace NEO { template AUBCommandStreamReceiverHw::AUBCommandStreamReceiverHw(const std::string &fileName, bool standalone, ExecutionEnvironment &executionEnvironment) @@ -814,4 +814,4 @@ int AUBCommandStreamReceiverHw::getAddressSpaceFromPTEBits(uint64_t e return AubMemDump::AddressSpaceValues::TraceNonlocal; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/aub_stream_provider.h b/runtime/command_stream/aub_stream_provider.h index add66f5b9a..1453d9fe71 100644 --- a/runtime/command_stream/aub_stream_provider.h +++ b/runtime/command_stream/aub_stream_provider.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class AubStreamProvider { public: @@ -28,4 +28,4 @@ class AubFileStreamProvider : public AubStreamProvider { protected: AubMemDump::AubFileStream stream; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/aub_subcapture.cpp b/runtime/command_stream/aub_subcapture.cpp index f695f55075..3291debf73 100644 --- a/runtime/command_stream/aub_subcapture.cpp +++ b/runtime/command_stream/aub_subcapture.cpp @@ -11,7 +11,7 @@ #include "runtime/kernel/kernel.h" #include "runtime/utilities/debug_settings_reader.h" -namespace OCLRT { +namespace NEO { AubSubCaptureManager::AubSubCaptureManager(const std::string &fileName) : initialFileName(fileName) { @@ -138,4 +138,4 @@ void AubSubCaptureManager::setDebugManagerFlags() const { DebugManager.flags.ForceCsrReprogramming.set(true); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/aub_subcapture.h b/runtime/command_stream/aub_subcapture.h index f127653132..fa45fdec5d 100644 --- a/runtime/command_stream/aub_subcapture.h +++ b/runtime/command_stream/aub_subcapture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct MultiDispatchInfo; class SettingsReader; @@ -66,4 +66,4 @@ class AubSubCaptureManager { std::string currentFileName; std::unique_ptr settingsReader; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp index 5a3a496b0e..33e1bc1863 100644 --- a/runtime/command_stream/command_stream_receiver.cpp +++ b/runtime/command_stream/command_stream_receiver.cpp @@ -25,7 +25,7 @@ #include "runtime/os_interface/os_interface.h" #include "runtime/utilities/tag_allocator.h" -namespace OCLRT { +namespace NEO { // Global table of CommandStreamReceiver factories for HW and tests CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE] = {}; @@ -397,4 +397,4 @@ void CommandStreamReceiver::expectMemory(const void *gfxAddress, const void *src size_t length, uint32_t compareOperation) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h index f938d9a4a5..521c79964e 100644 --- a/runtime/command_stream/command_stream_receiver.h +++ b/runtime/command_stream/command_stream_receiver.h @@ -21,7 +21,7 @@ #include #include -namespace OCLRT { +namespace NEO { class AllocationsList; class Device; class EventBuilder; @@ -249,4 +249,4 @@ class CommandStreamReceiver { }; typedef CommandStreamReceiver *(*CommandStreamReceiverCreateFunc)(bool withAubDump, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver_hw.h b/runtime/command_stream/command_stream_receiver_hw.h index 39cb99f509..21c63ed434 100644 --- a/runtime/command_stream/command_stream_receiver_hw.h +++ b/runtime/command_stream/command_stream_receiver_hw.h @@ -14,7 +14,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; @@ -106,4 +106,4 @@ class CommandStreamReceiverHw : public CommandStreamReceiver { bool localMemoryEnabled; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver_hw.inl b/runtime/command_stream/command_stream_receiver_hw.inl index e5239a7c0e..abef77dac9 100644 --- a/runtime/command_stream/command_stream_receiver_hw.inl +++ b/runtime/command_stream/command_stream_receiver_hw.inl @@ -30,7 +30,7 @@ #include "runtime/os_interface/os_context.h" #include "runtime/utilities/tag_allocator.h" -namespace OCLRT { +namespace NEO { template size_t CommandStreamReceiverHw::getSshHeapSize() { @@ -811,4 +811,4 @@ int CommandStreamReceiverHw::getRequiredPipeControlSize() const { const auto pipeControlCount = KernelCommandsHelper::isPipeControlWArequired() ? 2u : 1u; return pipeControlCount * sizeof(typename GfxFamily::PIPE_CONTROL); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h index 2f5857acb4..fef839d859 100644 --- a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h +++ b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h @@ -17,7 +17,7 @@ class AubManager; struct AubStream; } // namespace aub_stream -namespace OCLRT { +namespace NEO { class AddressMapper; class GraphicsAllocation; class HardwareContextController; @@ -70,4 +70,4 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw void CommandStreamReceiverSimulatedCommonHw::initGlobalMMIO() { @@ -137,4 +137,4 @@ void CommandStreamReceiverSimulatedCommonHw::freeEngineInfo(AddressMa engineInfo.pRingBuffer = nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver_with_aub_dump.h b/runtime/command_stream/command_stream_receiver_with_aub_dump.h index 2246a3d068..64861f3400 100644 --- a/runtime/command_stream/command_stream_receiver_with_aub_dump.h +++ b/runtime/command_stream/command_stream_receiver_with_aub_dump.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { template class CommandStreamReceiverWithAUBDump : public BaseCSR { @@ -32,4 +32,4 @@ class CommandStreamReceiverWithAUBDump : public BaseCSR { std::unique_ptr aubCSR; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl index 6f5c08ce47..fe642b3026 100644 --- a/runtime/command_stream/command_stream_receiver_with_aub_dump.inl +++ b/runtime/command_stream/command_stream_receiver_with_aub_dump.inl @@ -10,7 +10,7 @@ #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/execution_environment/execution_environment.h" -namespace OCLRT { +namespace NEO { extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE]; @@ -60,4 +60,4 @@ void CommandStreamReceiverWithAUBDump::setupContext(OsContext &osContex aubCSR->setupContext(osContext); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/create_command_stream_impl.cpp b/runtime/command_stream/create_command_stream_impl.cpp index f02038b926..33ec56f802 100644 --- a/runtime/command_stream/create_command_stream_impl.cpp +++ b/runtime/command_stream/create_command_stream_impl.cpp @@ -13,7 +13,7 @@ #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" -namespace OCLRT { +namespace NEO { extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE]; @@ -74,4 +74,4 @@ bool getDevicesImpl(HardwareInfo **hwInfo, size_t &numDevicesReturned, Execution return result; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/create_command_stream_impl.h b/runtime/command_stream/create_command_stream_impl.h index 6e2a835c27..4825e38400 100644 --- a/runtime/command_stream/create_command_stream_impl.h +++ b/runtime/command_stream/create_command_stream_impl.h @@ -9,8 +9,8 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { class ExecutionEnvironment; extern CommandStreamReceiver *createCommandStreamImpl(ExecutionEnvironment &executionEnvironment); extern bool getDevicesImpl(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/csr_definitions.h b/runtime/command_stream/csr_definitions.h index b9631a4039..c4a8f90a4b 100644 --- a/runtime/command_stream/csr_definitions.h +++ b/runtime/command_stream/csr_definitions.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { struct FlushStampTrackingObj; namespace CSRequirements { @@ -60,4 +60,4 @@ struct CsrSizeRequestFlags { bool numGrfRequiredChanged = false; bool specialPipelineSelectModeChanged = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h b/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h index ab363ab886..df3c4134bc 100644 --- a/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h +++ b/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h @@ -10,7 +10,7 @@ #include "runtime/memory_manager/memory_banks.h" #include "runtime/memory_manager/physical_address_allocator.h" -namespace OCLRT { +namespace NEO { class GraphicsAllocation; template class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCommonHw { @@ -30,4 +30,4 @@ class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCo } void writeMemoryWithAubManager(GraphicsAllocation &graphicsAllocation) override{}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/definitions/engine_node.h b/runtime/command_stream/definitions/engine_node.h index 5bfe354409..1382819e7d 100644 --- a/runtime/command_stream/definitions/engine_node.h +++ b/runtime/command_stream/definitions/engine_node.h @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { enum EngineType : uint32_t { ENGINE_RCS = 0, @@ -18,4 +18,4 @@ enum EngineType : uint32_t { NUM_ENGINES }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/device_command_stream.h b/runtime/command_stream/device_command_stream.h index 8ffc648a18..066efc449e 100644 --- a/runtime/command_stream/device_command_stream.h +++ b/runtime/command_stream/device_command_stream.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_stream/command_stream_receiver_hw.h" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver : public CommandStreamReceiverHw { @@ -22,4 +22,4 @@ class DeviceCommandStreamReceiver : public CommandStreamReceiverHw { public: static CommandStreamReceiver *create(bool withAubDump, ExecutionEnvironment &executionEnvironment); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/experimental_command_buffer.cpp b/runtime/command_stream/experimental_command_buffer.cpp index 9c317040e9..f8affaf29a 100644 --- a/runtime/command_stream/experimental_command_buffer.cpp +++ b/runtime/command_stream/experimental_command_buffer.cpp @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { ExperimentalCommandBuffer::ExperimentalCommandBuffer(CommandStreamReceiver *csr, double profilingTimerResolution) : commandStreamReceiver(csr), currentStream(nullptr), @@ -64,4 +64,4 @@ void ExperimentalCommandBuffer::makeResidentAllocations() { commandStreamReceiver->makeResident(*experimentalAllocation); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/experimental_command_buffer.h b/runtime/command_stream/experimental_command_buffer.h index 17f52becd3..bc661587c6 100644 --- a/runtime/command_stream/experimental_command_buffer.h +++ b/runtime/command_stream/experimental_command_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class GraphicsAllocation; @@ -63,4 +63,4 @@ class ExperimentalCommandBuffer { double timerResolution; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/experimental_command_buffer.inl b/runtime/command_stream/experimental_command_buffer.inl index f3ca124482..0e61caaa04 100644 --- a/runtime/command_stream/experimental_command_buffer.inl +++ b/runtime/command_stream/experimental_command_buffer.inl @@ -11,7 +11,7 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset) { @@ -106,4 +106,4 @@ size_t ExperimentalCommandBuffer::getExperimentalCommandsSize() noexcept { return sizeof(MI_SEMAPHORE_WAIT); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/linear_stream.cpp b/runtime/command_stream/linear_stream.cpp index c4c3a995af..6c87efc053 100644 --- a/runtime/command_stream/linear_stream.cpp +++ b/runtime/command_stream/linear_stream.cpp @@ -9,7 +9,7 @@ #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { LinearStream::LinearStream(void *buffer, size_t bufferSize) : sizeUsed(0), maxAvailableSpace(bufferSize), buffer(buffer), graphicsAllocation(nullptr) { @@ -29,4 +29,4 @@ LinearStream::LinearStream(GraphicsAllocation *gfxAllocation) LinearStream::LinearStream() : LinearStream(nullptr) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/linear_stream.h b/runtime/command_stream/linear_stream.h index dddd3eb02d..555f3c13f5 100644 --- a/runtime/command_stream/linear_stream.h +++ b/runtime/command_stream/linear_stream.h @@ -13,7 +13,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; class LinearStream { @@ -86,4 +86,4 @@ inline GraphicsAllocation *LinearStream::getGraphicsAllocation() const { inline void LinearStream::replaceGraphicsAllocation(GraphicsAllocation *gfxAllocation) { graphicsAllocation = gfxAllocation; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/preemption.cpp b/runtime/command_stream/preemption.cpp index 817bd19dd6..cd66104fd7 100644 --- a/runtime/command_stream/preemption.cpp +++ b/runtime/command_stream/preemption.cpp @@ -13,7 +13,7 @@ #include "runtime/helpers/string.h" #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { bool PreemptionHelper::allowThreadGroupPreemption(Kernel *kernel, const WorkaroundTable *waTable) { if (waTable->waDisablePerCtxtPreemptionGranularityControl) { @@ -97,4 +97,4 @@ PreemptionMode PreemptionHelper::getDefaultPreemptionMode(const HardwareInfo &hw : static_cast(DebugManager.flags.ForcePreemptionMode.get()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/preemption.h b/runtime/command_stream/preemption.h index 42423ef717..31aea891b4 100644 --- a/runtime/command_stream/preemption.h +++ b/runtime/command_stream/preemption.h @@ -12,7 +12,7 @@ #include "sku_info.h" -namespace OCLRT { +namespace NEO { class Kernel; class Device; class GraphicsAllocation; @@ -74,4 +74,4 @@ struct PreemptionConfig { static const uint32_t midThreadVal; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/preemption.inl b/runtime/command_stream/preemption.inl index a9af54276f..1161e8e0e4 100644 --- a/runtime/command_stream/preemption.inl +++ b/runtime/command_stream/preemption.inl @@ -13,7 +13,7 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { template size_t PreemptionHelper::getPreemptionWaCsSize(const Device &device) { @@ -137,4 +137,4 @@ template void PreemptionHelper::programInterfaceDescriptorDataPreemption(INTERFACE_DESCRIPTOR_DATA *idd, PreemptionMode preemptionMode) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/preemption_mode.h b/runtime/command_stream/preemption_mode.h index 4c2bdfc885..db97649317 100644 --- a/runtime/command_stream/preemption_mode.h +++ b/runtime/command_stream/preemption_mode.h @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { enum PreemptionMode : uint32_t { // Keep in sync with ForcePreemptionMode debug variable Initial = 0, @@ -17,4 +17,4 @@ enum PreemptionMode : uint32_t { ThreadGroup, MidThread, }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/scratch_space_controller.cpp b/runtime/command_stream/scratch_space_controller.cpp index 403b839e5b..b39cb8f952 100644 --- a/runtime/command_stream/scratch_space_controller.cpp +++ b/runtime/command_stream/scratch_space_controller.cpp @@ -13,7 +13,7 @@ #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { ScratchSpaceController::ScratchSpaceController(const HardwareInfo &info, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) : hwInfo(info), executionEnvironment(environment), csrAllocationStorage(allocationStorage) { auto &hwHelper = HwHelper::get(info.pPlatform->eRenderCoreFamily); @@ -30,4 +30,4 @@ MemoryManager *ScratchSpaceController::getMemoryManager() const { UNRECOVERABLE_IF(executionEnvironment.memoryManager.get() == nullptr); return executionEnvironment.memoryManager.get(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/scratch_space_controller.h b/runtime/command_stream/scratch_space_controller.h index a01eb29e65..d90c856497 100644 --- a/runtime/command_stream/scratch_space_controller.h +++ b/runtime/command_stream/scratch_space_controller.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Device; class ExecutionEnvironment; @@ -50,4 +50,4 @@ class ScratchSpaceController { bool force32BitAllocation = false; uint32_t computeUnitsUsedForScratch = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/scratch_space_controller_base.cpp b/runtime/command_stream/scratch_space_controller_base.cpp index c684c54d2c..088b7ffb7f 100644 --- a/runtime/command_stream/scratch_space_controller_base.cpp +++ b/runtime/command_stream/scratch_space_controller_base.cpp @@ -15,7 +15,7 @@ #include "runtime/memory_manager/memory_constants.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { ScratchSpaceControllerBase::ScratchSpaceControllerBase(const HardwareInfo &info, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) : ScratchSpaceController(info, environment, allocationStorage) { } @@ -72,4 +72,4 @@ uint64_t ScratchSpaceControllerBase::getScratchPatchAddress() { void ScratchSpaceControllerBase::reserveHeap(IndirectHeap::Type heapType, IndirectHeap *&indirectHeap) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/scratch_space_controller_base.h b/runtime/command_stream/scratch_space_controller_base.h index a0ee282c62..dfcc579b6c 100644 --- a/runtime/command_stream/scratch_space_controller_base.h +++ b/runtime/command_stream/scratch_space_controller_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_stream/scratch_space_controller.h" -namespace OCLRT { +namespace NEO { class ScratchSpaceControllerBase : public ScratchSpaceController { public: @@ -28,4 +28,4 @@ class ScratchSpaceControllerBase : public ScratchSpaceController { protected: void createScratchSpaceAllocation(); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/submissions_aggregator.cpp b/runtime/command_stream/submissions_aggregator.cpp index 1ca09fca45..8cf7d1cf4f 100644 --- a/runtime/command_stream/submissions_aggregator.cpp +++ b/runtime/command_stream/submissions_aggregator.cpp @@ -10,11 +10,11 @@ #include "runtime/helpers/flush_stamp.h" #include "runtime/memory_manager/graphics_allocation.h" -void OCLRT::SubmissionAggregator::recordCommandBuffer(CommandBuffer *commandBuffer) { +void NEO::SubmissionAggregator::recordCommandBuffer(CommandBuffer *commandBuffer) { this->cmdBuffers.pushTailOne(*commandBuffer); } -void OCLRT::SubmissionAggregator::aggregateCommandBuffers(ResourcePackage &resourcePackage, size_t &totalUsedSize, size_t totalMemoryBudget, uint32_t osContextId) { +void NEO::SubmissionAggregator::aggregateCommandBuffers(ResourcePackage &resourcePackage, size_t &totalUsedSize, size_t totalMemoryBudget, uint32_t osContextId) { auto primaryCommandBuffer = this->cmdBuffers.peekHead(); auto currentInspection = this->inspectionId; @@ -94,9 +94,9 @@ void OCLRT::SubmissionAggregator::aggregateCommandBuffers(ResourcePackage &resou } } -OCLRT::BatchBuffer::BatchBuffer(GraphicsAllocation *commandBufferAllocation, size_t startOffset, size_t chainedBatchBufferStartOffset, GraphicsAllocation *chainedBatchBuffer, bool requiresCoherency, bool lowPriority, QueueThrottle throttle, size_t usedSize, LinearStream *stream) : commandBufferAllocation(commandBufferAllocation), startOffset(startOffset), chainedBatchBufferStartOffset(chainedBatchBufferStartOffset), chainedBatchBuffer(chainedBatchBuffer), requiresCoherency(requiresCoherency), low_priority(lowPriority), throttle(throttle), usedSize(usedSize), stream(stream) { +NEO::BatchBuffer::BatchBuffer(GraphicsAllocation *commandBufferAllocation, size_t startOffset, size_t chainedBatchBufferStartOffset, GraphicsAllocation *chainedBatchBuffer, bool requiresCoherency, bool lowPriority, QueueThrottle throttle, size_t usedSize, LinearStream *stream) : commandBufferAllocation(commandBufferAllocation), startOffset(startOffset), chainedBatchBufferStartOffset(chainedBatchBufferStartOffset), chainedBatchBuffer(chainedBatchBuffer), requiresCoherency(requiresCoherency), low_priority(lowPriority), throttle(throttle), usedSize(usedSize), stream(stream) { } -OCLRT::CommandBuffer::CommandBuffer(Device &device) : device(device) { +NEO::CommandBuffer::CommandBuffer(Device &device) : device(device) { flushStamp.reset(new FlushStampTracker(false)); } diff --git a/runtime/command_stream/submissions_aggregator.h b/runtime/command_stream/submissions_aggregator.h index 920fa24b49..7c669bd9c3 100644 --- a/runtime/command_stream/submissions_aggregator.h +++ b/runtime/command_stream/submissions_aggregator.h @@ -13,7 +13,7 @@ #include "runtime/utilities/stackvec.h" #include -namespace OCLRT { +namespace NEO { class Device; class Event; class FlushStampTracker; @@ -70,4 +70,4 @@ class SubmissionAggregator { CommandBufferList cmdBuffers; uint32_t inspectionId = 1; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/tbx_command_stream_receiver.cpp b/runtime/command_stream/tbx_command_stream_receiver.cpp index dc5b06d3ca..94a470b1e4 100644 --- a/runtime/command_stream/tbx_command_stream_receiver.cpp +++ b/runtime/command_stream/tbx_command_stream_receiver.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE] = {}; @@ -29,4 +29,4 @@ CommandStreamReceiver *TbxCommandStreamReceiver::create(const std::string &baseN return pCreate ? pCreate(baseName, withAubDump, executionEnvironment) : nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/tbx_command_stream_receiver.h b/runtime/command_stream/tbx_command_stream_receiver.h index be8392ae7a..d381c1e8cc 100644 --- a/runtime/command_stream/tbx_command_stream_receiver.h +++ b/runtime/command_stream/tbx_command_stream_receiver.h @@ -15,7 +15,7 @@ // // notepad build_runtime_vs2013.bat -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class TbxSockets; class ExecutionEnvironment; @@ -46,8 +46,8 @@ class TbxStream : public AubMemDump::AubStream { struct TbxCommandStreamReceiver { static CommandStreamReceiver *create(const std::string &baseName, bool withAubDump, ExecutionEnvironment &executionEnvironment); - using TbxStream = OCLRT::TbxStream; + using TbxStream = NEO::TbxStream; }; typedef CommandStreamReceiver *(*TbxCommandStreamReceiverCreateFunc)(const std::string &baseName, bool withAubDump, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.h b/runtime/command_stream/tbx_command_stream_receiver_hw.h index 3556c03000..9f1fbdab44 100644 --- a/runtime/command_stream/tbx_command_stream_receiver_hw.h +++ b/runtime/command_stream/tbx_command_stream_receiver_hw.h @@ -14,7 +14,7 @@ #include "command_stream_receiver_simulated_hw.h" -namespace OCLRT { +namespace NEO { class TbxStream; @@ -82,4 +82,4 @@ class TbxCommandStreamReceiverHw : public CommandStreamReceiverSimulatedHw -namespace OCLRT { +namespace NEO { template TbxCommandStreamReceiverHw::TbxCommandStreamReceiverHw(ExecutionEnvironment &executionEnvironment) @@ -427,4 +427,4 @@ template bool TbxCommandStreamReceiverHw::getpollNotEqualValueForPollForCompletion() const { return false; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/tbx_stream.cpp b/runtime/command_stream/tbx_stream.cpp index 4424351218..05843a72b6 100644 --- a/runtime/command_stream/tbx_stream.cpp +++ b/runtime/command_stream/tbx_stream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/tbx/tbx_sockets.h" -namespace OCLRT { +namespace NEO { TbxStream::TbxStream() { } @@ -72,4 +72,4 @@ void TbxStream::readMemory(uint64_t physAddress, void *memory, size_t size) { socket->readMemory(physAddress, memory, size); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/command_stream/thread_arbitration_policy.h b/runtime/command_stream/thread_arbitration_policy.h index b44e366493..576f28e0bf 100644 --- a/runtime/command_stream/thread_arbitration_policy.h +++ b/runtime/command_stream/thread_arbitration_policy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { struct ThreadArbitrationPolicy { enum { AgeBased = 0x0u, @@ -16,4 +16,4 @@ struct ThreadArbitrationPolicy { NotPresent = 0xffffffffu }; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/binary_cache.cpp b/runtime/compiler_interface/binary_cache.cpp index c4e387f70f..b8e64965a5 100644 --- a/runtime/compiler_interface/binary_cache.cpp +++ b/runtime/compiler_interface/binary_cache.cpp @@ -23,7 +23,7 @@ #include #include -namespace OCLRT { +namespace NEO { std::mutex BinaryCache::cacheAccessMtx; const std::string BinaryCache::getCachedFileName(const HardwareInfo &hwInfo, const ArrayRef input, const ArrayRef options, const ArrayRef internalOptions) { @@ -98,4 +98,4 @@ bool BinaryCache::loadCachedBinary(const std::string kernelFileHash, Program &pr return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/binary_cache.h b/runtime/compiler_interface/binary_cache.h index 92cd2ca455..1d2a091609 100644 --- a/runtime/compiler_interface/binary_cache.h +++ b/runtime/compiler_interface/binary_cache.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class Program; @@ -31,4 +31,4 @@ class BinaryCache { static std::mutex cacheAccessMtx; std::string clCacheLocation; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/compiler_interface.cpp b/runtime/compiler_interface/compiler_interface.cpp index e8f28ae51a..79a8c06111 100644 --- a/runtime/compiler_interface/compiler_interface.cpp +++ b/runtime/compiler_interface/compiler_interface.cpp @@ -24,7 +24,7 @@ #include -namespace OCLRT { +namespace NEO { bool CompilerInterface::useLlvmText = false; std::mutex CompilerInterface::mtx; @@ -339,8 +339,8 @@ cl_int CompilerInterface::getSipKernelBinary(SipKernelType kernel, const Device bool CompilerInterface::initialize() { bool compilersModulesSuccessfulyLoaded = true; - compilersModulesSuccessfulyLoaded &= OCLRT::loadCompiler(Os::frontEndDllName, fclLib, fclMain); - compilersModulesSuccessfulyLoaded &= OCLRT::loadCompiler(Os::igcDllName, igcLib, igcMain); + compilersModulesSuccessfulyLoaded &= NEO::loadCompiler(Os::frontEndDllName, fclLib, fclMain); + compilersModulesSuccessfulyLoaded &= NEO::loadCompiler(Os::igcDllName, igcLib, igcMain); cache.reset(new BinaryCache()); @@ -431,7 +431,7 @@ CIF::RAII::UPtr_t CompilerInterface::createIgcT auto igcPlatform = newDeviceCtx->GetPlatformHandle(); auto igcGtSystemInfo = newDeviceCtx->GetGTSystemInfoHandle(); auto igcFeWa = newDeviceCtx->GetIgcFeaturesAndWorkaroundsHandle(); - if (false == OCLRT::areNotNullptr(igcPlatform.get(), igcGtSystemInfo.get(), igcFeWa.get())) { + if (false == NEO::areNotNullptr(igcPlatform.get(), igcGtSystemInfo.get(), igcFeWa.get())) { DEBUG_BREAK_IF(true); // could not acquire handles to device descriptors return nullptr; } @@ -479,4 +479,4 @@ CIF::RAII::UPtr_t CompilerInterface::createIgcT } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/compiler_interface.h b/runtime/compiler_interface/compiler_interface.h index 5f068a6918..5ef457b171 100644 --- a/runtime/compiler_interface/compiler_interface.h +++ b/runtime/compiler_interface/compiler_interface.h @@ -19,7 +19,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Device; class Program; @@ -100,4 +100,4 @@ class CompilerInterface { return (fclMain != nullptr) && (igcMain != nullptr); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/compiler_interface.inl b/runtime/compiler_interface/compiler_interface.inl index 777b740618..b604f5f3e7 100644 --- a/runtime/compiler_interface/compiler_interface.inl +++ b/runtime/compiler_interface/compiler_interface.inl @@ -14,13 +14,13 @@ #include "cif/import/library_api.h" #include "ocl_igc_interface/ocl_translation_output.h" -namespace OCLRT { +namespace NEO { using CIFBuffer = CIF::Builtins::BufferSimple; template inline CIF::RAII::UPtr_t translate(TranslationCtx *tCtx, CIFBuffer *src, CIFBuffer *options, CIFBuffer *internalOptions) { - if (false == OCLRT::areNotNullptr(tCtx, src, options, internalOptions)) { + if (false == NEO::areNotNullptr(tCtx, src, options, internalOptions)) { return nullptr; } @@ -38,7 +38,7 @@ inline CIF::RAII::UPtr_t translate(TranslationC template inline CIF::RAII::UPtr_t translate(TranslationCtx *tCtx, CIFBuffer *src, CIFBuffer *options, CIFBuffer *internalOptions, void *gtpinInit) { - if (false == OCLRT::areNotNullptr(tCtx, src, options, internalOptions)) { + if (false == NEO::areNotNullptr(tCtx, src, options, internalOptions)) { return nullptr; } @@ -85,4 +85,4 @@ inline bool loadCompiler(const char *libName, std::unique_ptr &outLib return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/compiler_options.cpp b/runtime/compiler_interface/compiler_options.cpp index a2d136d965..783988404c 100644 --- a/runtime/compiler_interface/compiler_options.cpp +++ b/runtime/compiler_interface/compiler_options.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/compiler_interface/compiler_options.h" -namespace OCLRT { +namespace NEO { const char *CompilerOptions::debugKernelEnable = " -cl-kernel-debug-enable"; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/compiler_options.h b/runtime/compiler_interface/compiler_options.h index ae3387b7e9..7e58a9e1d4 100644 --- a/runtime/compiler_interface/compiler_options.h +++ b/runtime/compiler_interface/compiler_options.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,8 +8,8 @@ #pragma once #include -namespace OCLRT { +namespace NEO { struct CompilerOptions { static const char *debugKernelEnable; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/compiler_interface/create_main.cpp b/runtime/compiler_interface/create_main.cpp index 2975937dff..0d34c908c7 100644 --- a/runtime/compiler_interface/create_main.cpp +++ b/runtime/compiler_interface/create_main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "cif/common/cif_main.h" #include "cif/common/library_api.h" -namespace OCLRT { +namespace NEO { #if defined(__clang__) __attribute__((no_sanitize("undefined"))) #endif @@ -16,4 +16,4 @@ CIF::CIFMain * createMainNoSanitize(CIF::CreateCIFMainFunc_t createFunc) { return createFunc(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp index 0a2dfca9ee..97d6b8dc5a 100644 --- a/runtime/context/context.cpp +++ b/runtime/context/context.cpp @@ -32,7 +32,7 @@ #include #include -namespace OCLRT { +namespace NEO { Context::Context( void(CL_CALLBACK *funcNotify)(const char *, const void *, size_t, void *), @@ -304,4 +304,4 @@ cl_int Context::getSupportedImageFormats( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/context.h b/runtime/context/context.h index 1f6c81418b..ac1eeb9ea9 100644 --- a/runtime/context/context.h +++ b/runtime/context/context.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { class CommandQueue; class Device; @@ -139,4 +139,4 @@ class Context : public BaseObject<_cl_context> { cl_bool preferD3dSharedResources = 0u; ContextType contextType = ContextType::CONTEXT_TYPE_DEFAULT; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/context.inl b/runtime/context/context.inl index 452447a7ba..116f8cb7e7 100644 --- a/runtime/context/context.inl +++ b/runtime/context/context.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/context/context.h" -namespace OCLRT { +namespace NEO { template void Context::registerSharing(Sharing *sharing) { @@ -23,4 +23,4 @@ Sharing *Context::getSharing() { return reinterpret_cast(sharingFunctions[Sharing::sharingId].get()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/context_extra.cpp b/runtime/context/context_extra.cpp index 8137cc2a2d..95fd2beb94 100644 --- a/runtime/context/context_extra.cpp +++ b/runtime/context/context_extra.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "runtime/context/context.h" -namespace OCLRT { +namespace NEO { cl_int Context::processExtraProperties(cl_context_properties propertyType, cl_context_properties propertyValue) { return CL_INVALID_PROPERTY; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/context_type.h b/runtime/context/context_type.h index d3506748c5..c134d13cd9 100644 --- a/runtime/context/context_type.h +++ b/runtime/context/context_type.h @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { enum ContextType : uint32_t { CONTEXT_TYPE_DEFAULT, @@ -16,4 +16,4 @@ enum ContextType : uint32_t { CONTEXT_TYPE_UNRESTRICTIVE }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/driver_diagnostics.cpp b/runtime/context/driver_diagnostics.cpp index 9f70e25434..0398709279 100644 --- a/runtime/context/driver_diagnostics.cpp +++ b/runtime/context/driver_diagnostics.cpp @@ -1,28 +1,13 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "driver_diagnostics.h" -namespace OCLRT { +namespace NEO { DriverDiagnostics::DriverDiagnostics(cl_diagnostics_verbose_level level) { this->verboseLevel = level; @@ -70,4 +55,4 @@ const char *DriverDiagnostics::hintFormat[] = { "Performance hint: Kernel %s private memory usage is too high and exhausts register space, additional surface needs to be allocated of size %u, consider reducing amount of private memory used, avoid using private memory arrays.", //PRIVATE_MEMORY_USAGE_TOO_HIGH "Performance hint: Kernel %s submission requires coherency with CPU; this will impact performance." //KERNEL_REQUIRES_COHERENCY }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/context/driver_diagnostics.h b/runtime/context/driver_diagnostics.h index 6dbf0d4ef1..ddbf38ff8f 100644 --- a/runtime/context/driver_diagnostics.h +++ b/runtime/context/driver_diagnostics.h @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "CL/cl_ext_intel.h" -namespace OCLRT { +namespace NEO { enum PerformanceHints { CL_BUFFER_DOESNT_MEET_ALIGNMENT_RESTRICTIONS, @@ -75,4 +60,4 @@ class DriverDiagnostics { protected: cl_diagnostics_verbose_level verboseLevel; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/device.cpp b/runtime/device/device.cpp index ab4c8254cf..498eb9debb 100644 --- a/runtime/device/device.cpp +++ b/runtime/device/device.cpp @@ -30,7 +30,7 @@ #include #include -namespace OCLRT { +namespace NEO { decltype(&PerformanceCounters::create) Device::createPerformanceCountersFunc = PerformanceCounters::create; @@ -287,4 +287,4 @@ EngineControl &Device::getEngine(EngineType engineType, bool lowPriority) { } UNRECOVERABLE_IF(true); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/device.h b/runtime/device/device.h index 8c4187bd9b..22003b714c 100644 --- a/runtime/device/device.h +++ b/runtime/device/device.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; class MemoryManager; @@ -183,4 +183,4 @@ inline GmmHelper *Device::getGmmHelper() const { return executionEnvironment->getGmmHelper(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/device_caps.cpp b/runtime/device/device_caps.cpp index 5737df2982..c61bfa6c97 100644 --- a/runtime/device/device_caps.cpp +++ b/runtime/device/device_caps.cpp @@ -22,7 +22,7 @@ #include -namespace OCLRT { +namespace NEO { extern const char *familyName[]; static std::string vendor = "Intel(R) Corporation"; @@ -338,4 +338,4 @@ void Device::initializeCaps() { this->preemptionMode = PreemptionMode::Disabled; } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/device_info.cpp b/runtime/device/device_info.cpp index 2a07a7ccb5..9a56fb6ab7 100644 --- a/runtime/device/device_info.cpp +++ b/runtime/device/device_info.cpp @@ -17,7 +17,7 @@ using DeviceInfoTable::Map; -namespace OCLRT { +namespace NEO { template inline void Device::getStr(const void *&src, @@ -234,4 +234,4 @@ bool Device::getHostTimer(uint64_t *hostTimestamp) const { return getOSTime()->getCpuTime(hostTimestamp); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/device_vector.h b/runtime/device/device_vector.h index e53cdf5cb4..d2e8d10ba0 100644 --- a/runtime/device/device_vector.h +++ b/runtime/device/device_vector.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class Device; class DeviceVector : public std::vector { public: @@ -22,4 +22,4 @@ class DeviceVector : public std::vector { void toDeviceIDs(std::vector &devIDs); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device/driver_info.h b/runtime/device/driver_info.h index 412edfe2d4..0a74108633 100644 --- a/runtime/device/driver_info.h +++ b/runtime/device/driver_info.h @@ -1,30 +1,15 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #pragma once #include -namespace OCLRT { +namespace NEO { class OSInterface; @@ -38,4 +23,4 @@ class DriverInfo { virtual std::string getVersion(std::string defaultVersion) { return defaultVersion; }; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device_queue/device_queue.cpp b/runtime/device_queue/device_queue.cpp index 31fbf643bb..dacf8209d9 100644 --- a/runtime/device_queue/device_queue.cpp +++ b/runtime/device_queue/device_queue.cpp @@ -14,7 +14,7 @@ #include "runtime/helpers/queue_helpers.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { DeviceQueueCreateFunc deviceQueueFactory[IGFX_MAX_CORE] = {}; const uint32_t DeviceQueue::numberOfDeviceEnqueues = 128; @@ -168,4 +168,4 @@ void DeviceQueue::dispatchScheduler(CommandQueue &cmdQ, LinearStream &commandStr IndirectHeap *DeviceQueue::getIndirectHeap(IndirectHeap::Type type) { return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device_queue/device_queue.h b/runtime/device_queue/device_queue.h index e35aa2a7a9..a6f8af6394 100644 --- a/runtime/device_queue/device_queue.h +++ b/runtime/device_queue/device_queue.h @@ -13,7 +13,7 @@ #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class CommandQueue; class Context; class Device; @@ -131,4 +131,4 @@ class DeviceQueue : public BaseObject<_device_queue> { typedef DeviceQueue *(*DeviceQueueCreateFunc)( Context *context, Device *device, cl_queue_properties &properties); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device_queue/device_queue_hw.h b/runtime/device_queue/device_queue_hw.h index bb94c2599f..e24f78766e 100644 --- a/runtime/device_queue/device_queue_hw.h +++ b/runtime/device_queue/device_queue_hw.h @@ -16,7 +16,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template class DeviceQueueHw : public DeviceQueue { @@ -91,4 +91,4 @@ class DeviceQueueHw : public DeviceQueue { LinearStream slbCS; IGIL_CommandQueue *igilQueue = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device_queue/device_queue_hw.inl b/runtime/device_queue/device_queue_hw.inl index b49e9eef66..f7eeea0d6a 100644 --- a/runtime/device_queue/device_queue_hw.inl +++ b/runtime/device_queue/device_queue_hw.inl @@ -15,7 +15,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/utilities/tag_allocator.h" -namespace OCLRT { +namespace NEO { template void DeviceQueueHw::allocateSlbBuffer() { auto slbSize = getMinimumSlbSize() + getWaCommandsSize(); @@ -453,4 +453,4 @@ size_t DeviceQueueHw::getProfilingEndCmdsSize() { template void DeviceQueueHw::addDcFlushToPipeControlWa(PIPE_CONTROL *pc) {} -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/device_queue/device_queue_hw_profiling.inl b/runtime/device_queue/device_queue_hw_profiling.inl index 565a444ce5..60182fc2a8 100644 --- a/runtime/device_queue/device_queue_hw_profiling.inl +++ b/runtime/device_queue/device_queue_hw_profiling.inl @@ -5,7 +5,7 @@ * */ -namespace OCLRT { +namespace NEO { template void DeviceQueueHw::addProfilingEndCmds(uint64_t timestampAddress) { @@ -21,4 +21,4 @@ void DeviceQueueHw::addProfilingEndCmds(uint64_t timestampAddress) { pMICmdLow->setRegisterAddress(GP_THREAD_TIME_REG_ADDRESS_OFFSET_LOW); pMICmdLow->setMemoryAddress(timestampAddress); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/create_command_stream.cpp b/runtime/dll/create_command_stream.cpp index 9e88b20131..819864470c 100644 --- a/runtime/dll/create_command_stream.cpp +++ b/runtime/dll/create_command_stream.cpp @@ -12,10 +12,10 @@ #include "runtime/command_stream/tbx_command_stream_receiver.h" #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment) { return createCommandStreamImpl(executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/create_deferred_deleter.cpp b/runtime/dll/create_deferred_deleter.cpp index 81bc83e55b..2ce10b078f 100644 --- a/runtime/dll/create_deferred_deleter.cpp +++ b/runtime/dll/create_deferred_deleter.cpp @@ -1,29 +1,14 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #include "runtime/memory_manager/deferred_deleter.h" -namespace OCLRT { +namespace NEO { std::unique_ptr createDeferredDeleter() { return std::unique_ptr(new DeferredDeleter()); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/dll/create_tbx_sockets.cpp b/runtime/dll/create_tbx_sockets.cpp index b03a47f438..eee49f294e 100644 --- a/runtime/dll/create_tbx_sockets.cpp +++ b/runtime/dll/create_tbx_sockets.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "runtime/tbx/tbx_sockets_imp.h" -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { TbxSockets *TbxSockets::create() { return new TbxSocketsImp; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/get_devices.cpp b/runtime/dll/get_devices.cpp index db7a65e4d3..fa6f2545ed 100644 --- a/runtime/dll/get_devices.cpp +++ b/runtime/dll/get_devices.cpp @@ -10,10 +10,10 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/device_factory.h" -namespace OCLRT { +namespace NEO { bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnviornment) { return getDevicesImpl(hwInfo, numDevicesReturned, executionEnviornment); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/linux/allocator_helper.cpp b/runtime/dll/linux/allocator_helper.cpp index d8d98946e5..e3050b0987 100644 --- a/runtime/dll/linux/allocator_helper.cpp +++ b/runtime/dll/linux/allocator_helper.cpp @@ -10,8 +10,8 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/basic_math.h" -namespace OCLRT { +namespace NEO { size_t getSizeToMap() { return static_cast(alignUp(4 * GB - 8096, 4096)); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/linux/create_drm_memory_manager.cpp b/runtime/dll/linux/create_drm_memory_manager.cpp index 8ad1f39258..3699f5215a 100644 --- a/runtime/dll/linux/create_drm_memory_manager.cpp +++ b/runtime/dll/linux/create_drm_memory_manager.cpp @@ -11,11 +11,11 @@ #include "runtime/os_interface/linux/os_interface.h" #include "runtime/os_interface/os_interface.h" -namespace OCLRT { +namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { return std::make_unique(gemCloseWorkerMode::gemCloseWorkerActive, DebugManager.flags.EnableForcePin.get(), true, executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/linux/drm_neo_create.cpp b/runtime/dll/linux/drm_neo_create.cpp index 6a5e102743..1c85b3fcf1 100644 --- a/runtime/dll/linux/drm_neo_create.cpp +++ b/runtime/dll/linux/drm_neo_create.cpp @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { const DeviceDescriptor deviceDescriptorTable[] = { #define DEVICE(devId, gt, gtType) {devId, >::hwInfo, >::setupHardwareInfo, gtType}, @@ -193,4 +193,4 @@ Drm *Drm::create(int32_t deviceOrdinal) { drms[deviceOrdinal % drms.size()] = drmObject.release(); return drms[deviceOrdinal % drms.size()]; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/linux/os_interface.cpp b/runtime/dll/linux/os_interface.cpp index f293ab8190..f8670524aa 100644 --- a/runtime/dll/linux/os_interface.cpp +++ b/runtime/dll/linux/os_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/os_interface/linux/os_interface.h" -namespace OCLRT { +namespace NEO { bool OSInterface::osEnableLocalMemory = false; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/dll/options.cpp b/runtime/dll/options.cpp index 4c35b2d385..c319410898 100644 --- a/runtime/dll/options.cpp +++ b/runtime/dll/options.cpp @@ -11,7 +11,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { // AUB file folder location const char *folderAUB = "."; @@ -25,4 +25,4 @@ static const HardwareInfo *DefaultPlatformDevices[] = { size_t numPlatformDevices = arrayCount(DefaultPlatformDevices); const HardwareInfo **platformDevices = DefaultPlatformDevices; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/source_level_debugger.cpp b/runtime/dll/source_level_debugger.cpp index 31cc8749d7..329a550755 100644 --- a/runtime/dll/source_level_debugger.cpp +++ b/runtime/dll/source_level_debugger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,9 +9,9 @@ using namespace std; -namespace OCLRT { +namespace NEO { OsLibrary *SourceLevelDebugger::loadDebugger() { return OsLibrary::load(SourceLevelDebugger::dllName); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/windows/create_wddm_memory_manager.cpp b/runtime/dll/windows/create_wddm_memory_manager.cpp index 5440d1dfc4..8b2fe4c1d7 100644 --- a/runtime/dll/windows/create_wddm_memory_manager.cpp +++ b/runtime/dll/windows/create_wddm_memory_manager.cpp @@ -12,8 +12,8 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" -namespace OCLRT { +namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { return std::make_unique(executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/dll/windows/environment_variables.cpp b/runtime/dll/windows/environment_variables.cpp index 5b66ae61ff..90c4093840 100644 --- a/runtime/dll/windows/environment_variables.cpp +++ b/runtime/dll/windows/environment_variables.cpp @@ -12,7 +12,7 @@ #include uint32_t getEnvironmentVariable(const char *name, char *outBuffer, uint32_t outBufferSize) { - if (OCLRT::DebugManager.registryReadAvailable() == false) { + if (NEO::DebugManager.registryReadAvailable() == false) { return 0; } return GetEnvironmentVariableA(name, outBuffer, outBufferSize); diff --git a/runtime/dll/windows/os_interface.cpp b/runtime/dll/windows/os_interface.cpp index 43b20d872b..feed77d352 100644 --- a/runtime/dll/windows/os_interface.cpp +++ b/runtime/dll/windows/os_interface.cpp @@ -8,8 +8,8 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { bool OSInterface::osEnableLocalMemory = true && is64bit; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/async_events_handler.cpp b/runtime/event/async_events_handler.cpp index 2998d98bf0..daf2b241dd 100644 --- a/runtime/event/async_events_handler.cpp +++ b/runtime/event/async_events_handler.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { AsyncEventsHandler::AsyncEventsHandler() { allowAsyncProcess = false; registerList.reserve(64); @@ -115,4 +115,4 @@ void AsyncEventsHandler::releaseEvents() { list.clear(); UNRECOVERABLE_IF(!registerList.empty()) // transferred before release } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/async_events_handler.h b/runtime/event/async_events_handler.h index cbf3b7d927..2f13f4ba7c 100644 --- a/runtime/event/async_events_handler.h +++ b/runtime/event/async_events_handler.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Event; class Thread; @@ -38,4 +38,4 @@ class AsyncEventsHandler { std::condition_variable asyncCond; std::atomic allowAsyncProcess; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event.cpp b/runtime/event/event.cpp index 8a81d5cc89..d1230738c8 100644 --- a/runtime/event/event.cpp +++ b/runtime/event/event.cpp @@ -26,7 +26,7 @@ #include "runtime/utilities/stackvec.h" #include "runtime/utilities/tag_allocator.h" -namespace OCLRT { +namespace NEO { const cl_uint Event::eventNotReady = 0xFFFFFFF0; @@ -45,7 +45,7 @@ Event::Event( cmdType(cmdType), dataCalculated(false), taskCount(taskCount) { - if (OCLRT::DebugManager.flags.EventsTrackerEnable.get()) { + if (NEO::DebugManager.flags.EventsTrackerEnable.get()) { EventsTracker::getEventsTracker().notifyCreation(this); } parentCount = 0; @@ -95,7 +95,7 @@ Event::Event( } Event::~Event() { - if (OCLRT::DebugManager.flags.EventsTrackerEnable.get()) { + if (NEO::DebugManager.flags.EventsTrackerEnable.get()) { EventsTracker::getEventsTracker().notifyDestruction(this); } @@ -221,7 +221,7 @@ cl_int Event::getEventProfilingInfo(cl_profiling_info paramName, } return retVal; -} // namespace OCLRT +} // namespace NEO uint32_t Event::getCompletionStamp() const { return this->taskCount; @@ -463,7 +463,7 @@ void Event::transitionExecutionStatus(int32_t newExecutionStatus) const { while (prevStatus > newExecutionStatus) { executionStatus.compare_exchange_weak(prevStatus, newExecutionStatus); } - if (OCLRT::DebugManager.flags.EventsTrackerEnable.get()) { + if (NEO::DebugManager.flags.EventsTrackerEnable.get()) { EventsTracker::getEventsTracker().notifyTransitionedExecutionStatus(); } } @@ -730,4 +730,4 @@ bool Event::checkUserEventDependencies(cl_uint numEventsInWaitList, const cl_eve return userEventsDependencies; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event.h b/runtime/event/event.h index 5cc793e015..0cfb7ab6ae 100644 --- a/runtime/event/event.h +++ b/runtime/event/event.h @@ -23,7 +23,7 @@ #define OCLRT_NUM_TIMESTAMP_BITS (32) -namespace OCLRT { +namespace NEO { template struct TagNode; class CommandQueue; @@ -385,4 +385,4 @@ class Event : public BaseObject<_cl_event>, public IDNode { // can be accessed only with updateTaskCount std::atomic taskCount; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event_builder.cpp b/runtime/event/event_builder.cpp index 7e8e91abe1..c3a8ee5ca3 100644 --- a/runtime/event/event_builder.cpp +++ b/runtime/event/event_builder.cpp @@ -13,7 +13,7 @@ #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/timestamp_packet.h" -namespace OCLRT { +namespace NEO { EventBuilder::~EventBuilder() { UNRECOVERABLE_IF((this->event == nullptr) && ((parentEvents.size() != 0U))); finalize(); @@ -74,4 +74,4 @@ void EventBuilder::clear() { parentEvents.clear(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event_builder.h b/runtime/event/event_builder.h index 2acc186bc6..1187a26661 100644 --- a/runtime/event/event_builder.h +++ b/runtime/event/event_builder.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { class Event; @@ -63,4 +63,4 @@ class EventBuilder { StackVec parentEvents; bool doNotRegister = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event_tracker.cpp b/runtime/event/event_tracker.cpp index b28ac0d27c..d655d8dc98 100644 --- a/runtime/event/event_tracker.cpp +++ b/runtime/event/event_tracker.cpp @@ -10,7 +10,7 @@ #include "runtime/command_queue/command_queue.h" #include "runtime/helpers/cl_helper.h" -namespace OCLRT { +namespace NEO { std::unique_ptr EventsTracker::globalEvTracker = nullptr; @@ -79,7 +79,7 @@ void EventsTracker::dumpNode(Event *node, std::ostream &out, const EventIdMap &e std::string eventType = isUserEvent ? "USER_EVENT" : (node->isCurrentCmdQVirtualEvent() ? "---V_EVENT " : "-----EVENT "); std::string commandType = ""; if (isUserEvent == false) { - commandType = OCLRT::cmdTypetoString(node->getCommandType()); + commandType = NEO::cmdTypetoString(node->getCommandType()); } static const char *status[] = { @@ -246,4 +246,4 @@ std::unique_ptr EventsTracker::createDumpStream(const std::string return std::make_unique(filename, std::ios::binary | std::ios::out); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/event_tracker.h b/runtime/event/event_tracker.h index 56fd5d40d4..4d0cd9909f 100644 --- a/runtime/event/event_tracker.h +++ b/runtime/event/event_tracker.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CommandQueue; @@ -55,4 +55,4 @@ class EventsTracker { const EventIdMap &eventsIdMapping); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/hw_timestamps.h b/runtime/event/hw_timestamps.h index aa1fc5f81c..a0e9b05c66 100644 --- a/runtime/event/hw_timestamps.h +++ b/runtime/event/hw_timestamps.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct HwTimeStamps { void initialize() { @@ -32,4 +32,4 @@ struct HwTimeStamps { uint64_t GlobalCompleteTS; uint64_t ContextCompleteTS; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/perf_counter.h b/runtime/event/perf_counter.h index c92cf6563f..83279841f0 100644 --- a/runtime/event/perf_counter.h +++ b/runtime/event/perf_counter.h @@ -12,7 +12,7 @@ #include "instrumentation.h" -namespace OCLRT { +namespace NEO { struct HwPerfCounter { void initialize() { @@ -26,4 +26,4 @@ struct HwPerfCounter { HwPerfCounters HWPerfCounters; HwTimeStamps HWTimeStamp; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/user_event.cpp b/runtime/event/user_event.cpp index a026fef937..6fd6839dac 100644 --- a/runtime/event/user_event.cpp +++ b/runtime/event/user_event.cpp @@ -12,7 +12,7 @@ #include "runtime/context/context.h" #include "runtime/device/device.h" -namespace OCLRT { +namespace NEO { UserEvent::UserEvent(Context *ctx) : Event(ctx, nullptr, CL_COMMAND_USER, eventNotReady, eventNotReady) { @@ -81,4 +81,4 @@ bool VirtualEvent::setStatus(cl_int status) { } return Event::setStatus(status); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/event/user_event.h b/runtime/event/user_event.h index ffca242d72..745b47ce12 100644 --- a/runtime/event/user_event.h +++ b/runtime/event/user_event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "event.h" -namespace OCLRT { +namespace NEO { class CommandQueue; class Context; @@ -41,4 +41,4 @@ class VirtualEvent : public Event { uint32_t getTaskLevel() override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/execution_environment/execution_environment.cpp b/runtime/execution_environment/execution_environment.cpp index e3f018594d..1eac84726f 100644 --- a/runtime/execution_environment/execution_environment.cpp +++ b/runtime/execution_environment/execution_environment.cpp @@ -20,7 +20,7 @@ #include "runtime/os_interface/os_interface.h" #include "runtime/source_level_debugger/source_level_debugger.h" -namespace OCLRT { +namespace NEO { ExecutionEnvironment::ExecutionEnvironment() = default; ExecutionEnvironment::~ExecutionEnvironment() = default; extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment); @@ -125,4 +125,4 @@ EngineControl *ExecutionEnvironment::getEngineControlForSpecialCsr() { return engine; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/execution_environment/execution_environment.h b/runtime/execution_environment/execution_environment.h index 39c03e26c3..f81b5603cd 100644 --- a/runtime/execution_environment/execution_environment.h +++ b/runtime/execution_environment/execution_environment.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { class AubCenter; class BuiltIns; class CommandStreamReceiver; @@ -72,4 +72,4 @@ class ExecutionEnvironment : public ReferenceTrackedObject std::unique_ptr compilerInterface; std::unique_ptr sourceLevelDebugger; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/execution_environment/execution_environment_initialize.cpp b/runtime/execution_environment/execution_environment_initialize.cpp index 5001b6c40e..9068c4f64f 100644 --- a/runtime/execution_environment/execution_environment_initialize.cpp +++ b/runtime/execution_environment/execution_environment_initialize.cpp @@ -7,8 +7,8 @@ #include "runtime/execution_environment/execution_environment.h" -namespace OCLRT { +namespace NEO { void ExecutionEnvironment::initializeSpecialCommandStreamReceiver() { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/aub_command_stream_receiver_gen10.cpp b/runtime/gen10/aub_command_stream_receiver_gen10.cpp index 9d409d5584..b423fe8d4a 100644 --- a/runtime/gen10/aub_command_stream_receiver_gen10.cpp +++ b/runtime/gen10/aub_command_stream_receiver_gen10.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -23,4 +23,4 @@ void populateFactoryTable>() { } template class AUBCommandStreamReceiverHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/aub_mapper.h b/runtime/gen10/aub_mapper.h index e57fc30b0e..e9886f0359 100644 --- a/runtime/gen10/aub_mapper.h +++ b/runtime/gen10/aub_mapper.h @@ -9,7 +9,7 @@ #include "runtime/gen_common/aub_mapper_base.h" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { struct CNLFamily; template <> @@ -25,4 +25,4 @@ struct AUBFamilyMapper { typedef AubMemDump::AubDump AUB; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/aub_mem_dump_gen10.cpp b/runtime/gen10/aub_mem_dump_gen10.cpp index 8f0b043d18..b8c4fc69b6 100644 --- a/runtime/gen10/aub_mem_dump_gen10.cpp +++ b/runtime/gen10/aub_mem_dump_gen10.cpp @@ -27,7 +27,7 @@ template struct AubPageTableHelper32>; template struct AubPageTableHelper64>; } // namespace AubMemDump -namespace OCLRT { +namespace NEO { using Family = CNLFamily; static const AubMemDump::LrcaHelperRcs rcs(0x002000); @@ -78,10 +78,10 @@ const MMIOList *AUBFamilyMapper::perEngineMMIO[EngineType::NUM_ENGINES] &mmioListBCS, &mmioListVCS, &mmioListVECS}; -} // namespace OCLRT +} // namespace NEO namespace AubAllocDump { -using namespace OCLRT; +using namespace NEO; template uint32_t getImageSurfaceTypeFromGmmResourceType(GMM_RESOURCE_TYPE gmmResourceType); diff --git a/runtime/gen10/buffer_gen10.cpp b/runtime/gen10/buffer_gen10.cpp index 4b1eae934f..a0e73af3c1 100644 --- a/runtime/gen10/buffer_gen10.cpp +++ b/runtime/gen10/buffer_gen10.cpp @@ -9,10 +9,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; #include "runtime/mem_obj/buffer_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/command_queue_gen10.cpp b/runtime/gen10/command_queue_gen10.cpp index 532e46003f..7e0ae1f7d0 100644 --- a/runtime/gen10/command_queue_gen10.cpp +++ b/runtime/gen10/command_queue_gen10.cpp @@ -9,7 +9,7 @@ #include "runtime/command_queue/command_queue_hw.inl" #include "runtime/memory_manager/svm_memory_manager.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -21,4 +21,4 @@ void populateFactoryTable>() { extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE]; commandQueueFactory[gfxCore] = CommandQueueHw::create; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/command_stream_receiver_hw_gen10.cpp b/runtime/gen10/command_stream_receiver_hw_gen10.cpp index fbabaffdec..737a7ed677 100644 --- a/runtime/gen10/command_stream_receiver_hw_gen10.cpp +++ b/runtime/gen10/command_stream_receiver_hw_gen10.cpp @@ -12,7 +12,7 @@ #include "hw_info.h" #include "reg_configs_common.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -68,4 +68,4 @@ const Family::GPGPU_CSR_BASE_ADDRESS Family::cmdInitGpgpuCsrBaseAddress = Family const Family::STATE_SIP Family::cmdInitStateSip = Family::STATE_SIP::sInit(); const Family::BINDING_TABLE_STATE Family::cmdInitBindingTableState = Family::BINDING_TABLE_STATE::sInit(); const Family::MI_USER_INTERRUPT Family::cmdInitUserInterrupt = Family::MI_USER_INTERRUPT::sInit(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/command_stream_receiver_simulated_common_hw_gen10.cpp b/runtime/gen10/command_stream_receiver_simulated_common_hw_gen10.cpp index 8caba740ab..db90501aa3 100644 --- a/runtime/gen10/command_stream_receiver_simulated_common_hw_gen10.cpp +++ b/runtime/gen10/command_stream_receiver_simulated_common_hw_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.inl" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; template class CommandStreamReceiverSimulatedCommonHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/device_queue_gen10.cpp b/runtime/gen10/device_queue_gen10.cpp index 57ed76821e..92e6455112 100644 --- a/runtime/gen10/device_queue_gen10.cpp +++ b/runtime/gen10/device_queue_gen10.cpp @@ -10,7 +10,7 @@ #include "runtime/device_queue/device_queue_hw_profiling.inl" #include "runtime/gen10/hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -43,4 +43,4 @@ template <> void DeviceQueueHw::addPipeControlCmdWa(bool isNoopCmd) {} template class DeviceQueueHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/enable_family_full_gen10.cpp b/runtime/gen10/enable_family_full_gen10.cpp index ae8ff9de87..86ec6e715a 100644 --- a/runtime/gen10/enable_family_full_gen10.cpp +++ b/runtime/gen10/enable_family_full_gen10.cpp @@ -20,7 +20,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/sampler/sampler.h" -namespace OCLRT { +namespace NEO { #ifdef HAVE_INSTRUMENTATION static_assert(std::is_same::value, "SInstrQueryPerfCountersLayout_Gen10 mismatch"); @@ -46,4 +46,4 @@ struct EnableGen10 { }; static EnableGen10 enable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/enable_gen10.cpp b/runtime/gen10/enable_gen10.cpp index d553f81af3..6c5d27226d 100644 --- a/runtime/gen10/enable_gen10.cpp +++ b/runtime/gen10/enable_gen10.cpp @@ -10,10 +10,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_CNL static EnableGfxProductHw enableGfxProductHwCNL; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/enable_hw_info_config_gen10.cpp b/runtime/gen10/enable_hw_info_config_gen10.cpp index aacf2ad655..3cf02a78a9 100644 --- a/runtime/gen10/enable_hw_info_config_gen10.cpp +++ b/runtime/gen10/enable_hw_info_config_gen10.cpp @@ -9,10 +9,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_CNL static EnableProductHwInfoConfig enableCNL; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/experimental_command_buffer_gen10.cpp b/runtime/gen10/experimental_command_buffer_gen10.cpp index abf424445a..8d4eb846c3 100644 --- a/runtime/gen10/experimental_command_buffer_gen10.cpp +++ b/runtime/gen10/experimental_command_buffer_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/command_stream/experimental_command_buffer.inl" #include "runtime/helpers/hw_helper.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); @@ -23,4 +23,4 @@ template size_t ExperimentalCommandBuffer::getTimeStampPipeControlSize(); template size_t ExperimentalCommandBuffer::getExperimentalCommandsSize() noexcept; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/gpgpu_walker_gen10.cpp b/runtime/gen10/gpgpu_walker_gen10.cpp index 5147086756..b59327b6b7 100644 --- a/runtime/gen10/gpgpu_walker_gen10.cpp +++ b/runtime/gen10/gpgpu_walker_gen10.cpp @@ -13,7 +13,7 @@ #include "runtime/command_queue/hardware_interface_base.inl" #include "runtime/gen10/hw_info.h" -namespace OCLRT { +namespace NEO { template class HardwareInterface; @@ -21,4 +21,4 @@ template class GpgpuWalkerHelper; template struct EnqueueOperation; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/gtpin_setup_gen10.cpp b/runtime/gen10/gtpin_setup_gen10.cpp index b1d9676dfa..1919a737b5 100644 --- a/runtime/gen10/gtpin_setup_gen10.cpp +++ b/runtime/gen10/gtpin_setup_gen10.cpp @@ -10,7 +10,7 @@ #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" -namespace OCLRT { +namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; @@ -32,4 +32,4 @@ struct GTPinEnableGen10 { static GTPinEnableGen10 gtpinEnable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/hw_cmds.h b/runtime/gen10/hw_cmds.h index 2767c93dfa..279b328e8f 100644 --- a/runtime/gen10/hw_cmds.h +++ b/runtime/gen10/hw_cmds.h @@ -17,7 +17,7 @@ #define TILERESOURCE_CHICKENBIT_VECTOR_BITMASK (1UL << 8) template struct CmdParse; -namespace OCLRT { +namespace NEO { struct GEN10 { #include "runtime/gen10/hw_cmds_generated.h" @@ -112,4 +112,4 @@ class CNL_4x9x8 : public CNL { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/hw_helper_gen10.cpp b/runtime/gen10/hw_helper_gen10.cpp index dd1c7a9019..4c28c5562a 100644 --- a/runtime/gen10/hw_helper_gen10.cpp +++ b/runtime/gen10/hw_helper_gen10.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_helper_common.inl" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; template <> @@ -33,4 +33,4 @@ template class AubHelperHw; template class HwHelperHw; template class FlatBatchBufferHelperHw; template struct PipeControlHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/hw_info.h b/runtime/gen10/hw_info.h index 8dcbf72b29..8e0dc42b8e 100644 --- a/runtime/gen10/hw_info.h +++ b/runtime/gen10/hw_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { struct CNLFamily; struct CNL; @@ -27,4 +27,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef CNL GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/hw_info_cnl.inl b/runtime/gen10/hw_info_cnl.inl index f69df3bf62..01b48fe9aa 100644 --- a/runtime/gen10/hw_info_cnl.inl +++ b/runtime/gen10/hw_info_cnl.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "cnl"; @@ -232,4 +232,4 @@ void setupCNLHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*CNL::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupCNLHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/hw_info_gen10.cpp b/runtime/gen10/hw_info_gen10.cpp index 21cb8e3211..71f63f9356 100644 --- a/runtime/gen10/hw_info_gen10.cpp +++ b/runtime/gen10/hw_info_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,6 @@ #include "hw_info_cnl.inl" #endif -namespace OCLRT { +namespace NEO { const char *GfxFamilyMapper::name = "Gen10"; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/image_gen10.cpp b/runtime/gen10/image_gen10.cpp index 926dc93e68..64c390d37c 100644 --- a/runtime/gen10/image_gen10.cpp +++ b/runtime/gen10/image_gen10.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -41,4 +41,4 @@ void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void } #include "runtime/mem_obj/image_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/kernel_commands_gen10.cpp b/runtime/gen10/kernel_commands_gen10.cpp index 7f14055c74..815decc2ee 100644 --- a/runtime/gen10/kernel_commands_gen10.cpp +++ b/runtime/gen10/kernel_commands_gen10.cpp @@ -11,7 +11,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template struct KernelCommandsHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/linux/command_stream_receiver_gen10.cpp b/runtime/gen10/linux/command_stream_receiver_gen10.cpp index 24b1753eb6..1b612413ce 100644 --- a/runtime/gen10/linux/command_stream_receiver_gen10.cpp +++ b/runtime/gen10/linux/command_stream_receiver_gen10.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/linux/device_command_stream.inl" #include "runtime/os_interface/linux/drm_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class DrmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/linux/hw_info_config_cnl.inl b/runtime/gen10/linux/hw_info_config_cnl.inl index b21b4a1cca..bcc7ab1434 100644 --- a/runtime/gen10/linux/hw_info_config_cnl.inl +++ b/runtime/gen10/linux/hw_info_config_cnl.inl @@ -8,7 +8,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -76,4 +76,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInf } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/preamble_gen10.cpp b/runtime/gen10/preamble_gen10.cpp index 4fa483143a..d4e0cd9192 100644 --- a/runtime/gen10/preamble_gen10.cpp +++ b/runtime/gen10/preamble_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/command_stream/csr_definitions.h" #include "runtime/helpers/preamble.inl" -namespace OCLRT { +namespace NEO { template <> uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool useSLM) { @@ -81,4 +81,4 @@ void PreambleHelper::programPipelineSelect(LinearStream *pCommandStre } template struct PreambleHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/preemption_gen10.cpp b/runtime/gen10/preemption_gen10.cpp index c670065d24..6197c841c8 100644 --- a/runtime/gen10/preemption_gen10.cpp +++ b/runtime/gen10/preemption_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/command_stream/preemption.inl" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily GfxFamily; @@ -58,4 +58,4 @@ void PreemptionHelper::programInterfaceDescriptorDataPreemption(INTER idd->setThreadPreemptionDisable(INTERFACE_DESCRIPTOR_DATA::THREAD_PREEMPTION_DISABLE_ENABLE); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/reg_configs.h b/runtime/gen10/reg_configs.h index c06b017441..f2b9c617a2 100644 --- a/runtime/gen10/reg_configs.h +++ b/runtime/gen10/reg_configs.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/helpers/preamble.h" -namespace OCLRT { +namespace NEO { struct CNLFamily; template <> @@ -24,4 +24,4 @@ struct L3CNTLRegisterOffset { const uint32_t gen10HdcModeRegisterAddresss = 0xE5F0; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/sampler_gen10.cpp b/runtime/gen10/sampler_gen10.cpp index bd52fb2800..5004307f32 100644 --- a/runtime/gen10/sampler_gen10.cpp +++ b/runtime/gen10/sampler_gen10.cpp @@ -10,10 +10,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; #include "runtime/sampler/sampler_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/state_base_address_gen10.cpp b/runtime/gen10/state_base_address_gen10.cpp index a637c3eacd..1e5c37e987 100644 --- a/runtime/gen10/state_base_address_gen10.cpp +++ b/runtime/gen10/state_base_address_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,6 @@ #include "runtime/helpers/state_base_address.h" #include "runtime/helpers/state_base_address.inl" -namespace OCLRT { +namespace NEO { template struct StateBaseAddressHelper; } diff --git a/runtime/gen10/tbx_command_stream_receiver_gen10.cpp b/runtime/gen10/tbx_command_stream_receiver_gen10.cpp index b49148bf59..98a5365758 100644 --- a/runtime/gen10/tbx_command_stream_receiver_gen10.cpp +++ b/runtime/gen10/tbx_command_stream_receiver_gen10.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; static auto gfxCore = IGFX_GEN10_CORE; @@ -26,4 +26,4 @@ void populateFactoryTable>() { template class TbxCommandStreamReceiverHw; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/windows/command_stream_receiver_gen10.cpp b/runtime/gen10/windows/command_stream_receiver_gen10.cpp index 1c852c955d..4ab8c1de9f 100644 --- a/runtime/gen10/windows/command_stream_receiver_gen10.cpp +++ b/runtime/gen10/windows/command_stream_receiver_gen10.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/windows/device_command_stream.inl" #include "runtime/os_interface/windows/wddm_device_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class WddmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen10/windows/gmm_callbacks_gen10.cpp b/runtime/gen10/windows/gmm_callbacks_gen10.cpp index b516447029..a1a3542f54 100644 --- a/runtime/gen10/windows/gmm_callbacks_gen10.cpp +++ b/runtime/gen10/windows/gmm_callbacks_gen10.cpp @@ -10,7 +10,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; template struct DeviceCallbacks; template struct TTCallbacks; diff --git a/runtime/gen10/windows/hw_info_config_gen10.cpp b/runtime/gen10/windows/hw_info_config_gen10.cpp index 561b01f841..7fa79cbe9b 100644 --- a/runtime/gen10/windows/hw_info_config_gen10.cpp +++ b/runtime/gen10/windows/hw_info_config_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_CNL template <> @@ -20,4 +20,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInf template class HwInfoConfigHw; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/aub_command_stream_receiver_gen8.cpp b/runtime/gen8/aub_command_stream_receiver_gen8.cpp index 0e55083359..4f0c6da819 100644 --- a/runtime/gen8/aub_command_stream_receiver_gen8.cpp +++ b/runtime/gen8/aub_command_stream_receiver_gen8.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -23,4 +23,4 @@ void populateFactoryTable>() { } template class AUBCommandStreamReceiverHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/aub_mapper.h b/runtime/gen8/aub_mapper.h index c976c54f40..16979c8005 100644 --- a/runtime/gen8/aub_mapper.h +++ b/runtime/gen8/aub_mapper.h @@ -9,7 +9,7 @@ #include "runtime/gen_common/aub_mapper_base.h" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { struct BDWFamily; template <> @@ -25,4 +25,4 @@ struct AUBFamilyMapper { typedef AubMemDump::AubDump AUB; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/aub_mem_dump_gen8.cpp b/runtime/gen8/aub_mem_dump_gen8.cpp index 6b0943fd15..24e3f2dcdb 100644 --- a/runtime/gen8/aub_mem_dump_gen8.cpp +++ b/runtime/gen8/aub_mem_dump_gen8.cpp @@ -25,7 +25,7 @@ template struct AubPageTableHelper32>; template struct AubPageTableHelper64>; } // namespace AubMemDump -namespace OCLRT { +namespace NEO { using Family = BDWFamily; static const AubMemDump::LrcaHelperRcs rcs(0x002000); @@ -63,10 +63,10 @@ const MMIOList *AUBFamilyMapper::perEngineMMIO[EngineType::NUM_ENGINES] &mmioListBCS, &mmioListVCS, &mmioListVECS}; -} // namespace OCLRT +} // namespace NEO namespace AubAllocDump { -using namespace OCLRT; +using namespace NEO; template uint32_t getImageSurfaceTypeFromGmmResourceType(GMM_RESOURCE_TYPE gmmResourceType); diff --git a/runtime/gen8/buffer_gen8.cpp b/runtime/gen8/buffer_gen8.cpp index 329dab400c..0122cf08a0 100644 --- a/runtime/gen8/buffer_gen8.cpp +++ b/runtime/gen8/buffer_gen8.cpp @@ -9,10 +9,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; #include "runtime/mem_obj/buffer_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/command_queue_gen8.cpp b/runtime/gen8/command_queue_gen8.cpp index 068cfb5fe7..cf361d9833 100644 --- a/runtime/gen8/command_queue_gen8.cpp +++ b/runtime/gen8/command_queue_gen8.cpp @@ -9,7 +9,7 @@ #include "runtime/command_queue/command_queue_hw.inl" #include "runtime/memory_manager/svm_memory_manager.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -22,4 +22,4 @@ void populateFactoryTable>() { commandQueueFactory[gfxCore] = CommandQueueHw::create; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/command_stream_receiver_hw_gen8.cpp b/runtime/gen8/command_stream_receiver_hw_gen8.cpp index 41e1f635db..20e52860ec 100644 --- a/runtime/gen8/command_stream_receiver_hw_gen8.cpp +++ b/runtime/gen8/command_stream_receiver_hw_gen8.cpp @@ -11,7 +11,7 @@ #include "hw_cmds.h" #include "hw_info.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -71,4 +71,4 @@ const Family::GPGPU_CSR_BASE_ADDRESS Family::cmdInitGpgpuCsrBaseAddress = Family const Family::STATE_SIP Family::cmdInitStateSip = Family::STATE_SIP::sInit(); const Family::BINDING_TABLE_STATE Family::cmdInitBindingTableState = Family::BINDING_TABLE_STATE::sInit(); const Family::MI_USER_INTERRUPT Family::cmdInitUserInterrupt = Family::MI_USER_INTERRUPT::sInit(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp b/runtime/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp index 6e56342b44..d758ebb63e 100644 --- a/runtime/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp +++ b/runtime/gen8/command_stream_receiver_simulated_common_hw_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.inl" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; template class CommandStreamReceiverSimulatedCommonHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/device_queue_gen8.cpp b/runtime/gen8/device_queue_gen8.cpp index d5138bc288..2208451241 100644 --- a/runtime/gen8/device_queue_gen8.cpp +++ b/runtime/gen8/device_queue_gen8.cpp @@ -9,7 +9,7 @@ #include "runtime/device_queue/device_queue_hw.inl" #include "runtime/gen8/hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -71,4 +71,4 @@ void DeviceQueueHw::addDcFlushToPipeControlWa(PIPE_CONTROL *pc) { } template class DeviceQueueHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/enable_family_full_gen8.cpp b/runtime/gen8/enable_family_full_gen8.cpp index 888a742301..868ef5b39b 100644 --- a/runtime/gen8/enable_family_full_gen8.cpp +++ b/runtime/gen8/enable_family_full_gen8.cpp @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; @@ -42,4 +42,4 @@ struct EnableGen8 { }; static EnableGen8 enable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/enable_gen8.cpp b/runtime/gen8/enable_gen8.cpp index 04e0570d38..7b0fdd1401 100644 --- a/runtime/gen8/enable_gen8.cpp +++ b/runtime/gen8/enable_gen8.cpp @@ -10,10 +10,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BDW static EnableGfxProductHw enableGfxProductHwBDW; #endif -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/gen8/enable_hw_info_config_gen8.cpp b/runtime/gen8/enable_hw_info_config_gen8.cpp index 662ff6c609..53632cab5e 100644 --- a/runtime/gen8/enable_hw_info_config_gen8.cpp +++ b/runtime/gen8/enable_hw_info_config_gen8.cpp @@ -9,10 +9,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BDW static EnableProductHwInfoConfig enableBDW; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/experimental_command_buffer_gen8.cpp b/runtime/gen8/experimental_command_buffer_gen8.cpp index aec2e6f59a..e270877a09 100644 --- a/runtime/gen8/experimental_command_buffer_gen8.cpp +++ b/runtime/gen8/experimental_command_buffer_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/command_stream/experimental_command_buffer.inl" #include "runtime/helpers/hw_helper.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); @@ -23,4 +23,4 @@ template size_t ExperimentalCommandBuffer::getTimeStampPipeControlSize(); template size_t ExperimentalCommandBuffer::getExperimentalCommandsSize() noexcept; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/gpgpu_walker_gen8.cpp b/runtime/gen8/gpgpu_walker_gen8.cpp index 5b64557fd9..8a3444b628 100644 --- a/runtime/gen8/gpgpu_walker_gen8.cpp +++ b/runtime/gen8/gpgpu_walker_gen8.cpp @@ -13,10 +13,10 @@ #include "runtime/command_queue/hardware_interface_base.inl" #include "runtime/gen8/hw_info.h" -namespace OCLRT { +namespace NEO { template <> -void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(OCLRT::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { +void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { if (disablePerfMode) { if (kernel.getKernelInfo().patchInfo.executionEnvironment->UsesFencesForReadWriteImages) { // Set bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 @@ -61,4 +61,4 @@ template class GpgpuWalkerHelper; template struct EnqueueOperation; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/gtpin_setup_gen8.cpp b/runtime/gen8/gtpin_setup_gen8.cpp index eb946afee8..50acba691f 100644 --- a/runtime/gen8/gtpin_setup_gen8.cpp +++ b/runtime/gen8/gtpin_setup_gen8.cpp @@ -10,7 +10,7 @@ #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" -namespace OCLRT { +namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; @@ -32,4 +32,4 @@ struct GTPinEnableGen8 { static GTPinEnableGen8 gtpinEnable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_cmds_base.h b/runtime/gen8/hw_cmds_base.h index 297c102c7b..0ce62dd129 100644 --- a/runtime/gen8/hw_cmds_base.h +++ b/runtime/gen8/hw_cmds_base.h @@ -17,7 +17,7 @@ //forward declaration for parsing logic template struct CmdParse; -namespace OCLRT { +namespace NEO { struct GEN8 { #include "runtime/gen8/hw_cmds_generated.h" @@ -61,4 +61,4 @@ struct BDWFamily : public GEN8 { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_cmds_bdw.h b/runtime/gen8/hw_cmds_bdw.h index c6e43ee843..ea499dc287 100644 --- a/runtime/gen8/hw_cmds_bdw.h +++ b/runtime/gen8/hw_cmds_bdw.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct BDW : public BDWFamily { static const PLATFORM platform; @@ -54,4 +54,4 @@ class BDW_2x3x8 : public BDW { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_helper_gen8.cpp b/runtime/gen8/hw_helper_gen8.cpp index 34932b92a9..e8dc27a8e8 100644 --- a/runtime/gen8/hw_helper_gen8.cpp +++ b/runtime/gen8/hw_helper_gen8.cpp @@ -12,7 +12,7 @@ #include "runtime/helpers/hw_helper_common.inl" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; template <> @@ -32,4 +32,4 @@ template class AubHelperHw; template class HwHelperHw; template class FlatBatchBufferHelperHw; template struct PipeControlHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_info_bdw.h b/runtime/gen8/hw_info_bdw.h index 34c660d8af..f122afd0fd 100644 --- a/runtime/gen8/hw_info_bdw.h +++ b/runtime/gen8/hw_info_bdw.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "hw_info_gen8.h" -namespace OCLRT { +namespace NEO { struct BDW; @@ -20,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef BDW GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl index 54a5528c1b..67d354977e 100644 --- a/runtime/gen8/hw_info_bdw.inl +++ b/runtime/gen8/hw_info_bdw.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "bdw"; @@ -207,4 +207,4 @@ void setupBDWHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*BDW::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupBDWHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_info_gen8.cpp b/runtime/gen8/hw_info_gen8.cpp index 79826d7d1c..6e55a16390 100644 --- a/runtime/gen8/hw_info_gen8.cpp +++ b/runtime/gen8/hw_info_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,6 @@ #include "hw_info_bdw.inl" #endif -namespace OCLRT { +namespace NEO { const char *GfxFamilyMapper::name = "Gen8"; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/hw_info_gen8.h b/runtime/gen8/hw_info_gen8.h index d469ece453..0145be6a13 100644 --- a/runtime/gen8/hw_info_gen8.h +++ b/runtime/gen8/hw_info_gen8.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { struct BDWFamily; @@ -17,4 +17,4 @@ struct GfxFamilyMapper { typedef BDWFamily GfxFamily; static const char *name; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/image_gen8.cpp b/runtime/gen8/image_gen8.cpp index d99f7e06d2..edad65dd59 100644 --- a/runtime/gen8/image_gen8.cpp +++ b/runtime/gen8/image_gen8.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -25,4 +25,4 @@ template void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void *, uint32_t) {} #include "runtime/mem_obj/image_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/kernel_commands_gen8.cpp b/runtime/gen8/kernel_commands_gen8.cpp index f0bf34bbe3..68cc17f16b 100644 --- a/runtime/gen8/kernel_commands_gen8.cpp +++ b/runtime/gen8/kernel_commands_gen8.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { static uint32_t slmSizeId[] = {0, 1, 2, 4, 4, 8, 8, 8, 8, 16, 16, 16, 16, 16, 16, 16}; @@ -29,4 +29,4 @@ uint32_t KernelCommandsHelper::computeSlmValues(uint32_t valueIn) { // Explicitly instantiate KernelCommandsHelper for BDW device family template struct KernelCommandsHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/linux/command_stream_receiver_gen8.cpp b/runtime/gen8/linux/command_stream_receiver_gen8.cpp index b923c8ae86..1d1fa12392 100644 --- a/runtime/gen8/linux/command_stream_receiver_gen8.cpp +++ b/runtime/gen8/linux/command_stream_receiver_gen8.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/linux/device_command_stream.inl" #include "runtime/os_interface/linux/drm_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class DrmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/linux/hw_info_config_bdw.inl b/runtime/gen8/linux/hw_info_config_bdw.inl index 552ca4f1cc..ffae79e3f3 100644 --- a/runtime/gen8/linux/hw_info_config_bdw.inl +++ b/runtime/gen8/linux/hw_info_config_bdw.inl @@ -8,7 +8,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -51,4 +51,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/preamble_gen8.cpp b/runtime/gen8/preamble_gen8.cpp index 615fa20d73..b8472f8d20 100644 --- a/runtime/gen8/preamble_gen8.cpp +++ b/runtime/gen8/preamble_gen8.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/preamble.inl" -namespace OCLRT { +namespace NEO { template <> void PreambleHelper::addPipeControlBeforeVfeCmd(LinearStream *pCommandStream, const HardwareInfo *hwInfo) { @@ -46,4 +46,4 @@ size_t PreambleHelper::getAdditionalCommandsSize(const Device &device } template struct PreambleHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/preemption_gen8.cpp b/runtime/gen8/preemption_gen8.cpp index 592ae62c0c..8500dd55f4 100644 --- a/runtime/gen8/preemption_gen8.cpp +++ b/runtime/gen8/preemption_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/command_stream/preemption.h" #include "runtime/command_stream/preemption.inl" -namespace OCLRT { +namespace NEO { typedef BDWFamily GfxFamily; @@ -65,4 +65,4 @@ template void PreemptionHelper::applyPreemptionWaCmdsBegin(LinearStre template void PreemptionHelper::applyPreemptionWaCmdsEnd(LinearStream *pCommandStream, const Device &device); template void PreemptionHelper::programInterfaceDescriptorDataPreemption(INTERFACE_DESCRIPTOR_DATA *idd, PreemptionMode preemptionMode); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/reg_configs.h b/runtime/gen8/reg_configs.h index 75da8840fb..0fdb7f8fa4 100644 --- a/runtime/gen8/reg_configs.h +++ b/runtime/gen8/reg_configs.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/helpers/preamble.h" -namespace OCLRT { +namespace NEO { struct BDWFamily; template <> @@ -21,4 +21,4 @@ template <> struct L3CNTLRegisterOffset { static const uint32_t registerOffset = 0x7034; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/sampler_gen8.cpp b/runtime/gen8/sampler_gen8.cpp index 371ec25fa3..6bb42af2d0 100644 --- a/runtime/gen8/sampler_gen8.cpp +++ b/runtime/gen8/sampler_gen8.cpp @@ -10,10 +10,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; #include "runtime/sampler/sampler_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/state_base_address_gen8.cpp b/runtime/gen8/state_base_address_gen8.cpp index a495d9c1c1..c421fb3bf4 100644 --- a/runtime/gen8/state_base_address_gen8.cpp +++ b/runtime/gen8/state_base_address_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,6 @@ #include "runtime/helpers/state_base_address.h" #include "runtime/helpers/state_base_address.inl" -namespace OCLRT { +namespace NEO { template struct StateBaseAddressHelper; } diff --git a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp index 041398ca0f..486bcab497 100644 --- a/runtime/gen8/tbx_command_stream_receiver_gen8.cpp +++ b/runtime/gen8/tbx_command_stream_receiver_gen8.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; static auto gfxCore = IGFX_GEN8_CORE; @@ -27,4 +27,4 @@ void populateFactoryTable>() { template class TbxCommandStreamReceiverHw; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/windows/command_stream_receiver_gen8.cpp b/runtime/gen8/windows/command_stream_receiver_gen8.cpp index a75b05330b..1ca826ef89 100644 --- a/runtime/gen8/windows/command_stream_receiver_gen8.cpp +++ b/runtime/gen8/windows/command_stream_receiver_gen8.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/windows/device_command_stream.inl" #include "runtime/os_interface/windows/wddm_device_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class WddmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen8/windows/gmm_callbacks_gen8.cpp b/runtime/gen8/windows/gmm_callbacks_gen8.cpp index ad14970726..af2443db76 100644 --- a/runtime/gen8/windows/gmm_callbacks_gen8.cpp +++ b/runtime/gen8/windows/gmm_callbacks_gen8.cpp @@ -10,7 +10,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; template struct DeviceCallbacks; template struct TTCallbacks; diff --git a/runtime/gen8/windows/hw_info_config_gen8.cpp b/runtime/gen8/windows/hw_info_config_gen8.cpp index d482d7d2a2..fd0950001a 100644 --- a/runtime/gen8/windows/hw_info_config_gen8.cpp +++ b/runtime/gen8/windows/hw_info_config_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BDW template <> @@ -20,4 +20,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo template class HwInfoConfigHw; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/aub_command_stream_receiver_gen9.cpp b/runtime/gen9/aub_command_stream_receiver_gen9.cpp index 1a0be6b845..26fbf2bd8e 100644 --- a/runtime/gen9/aub_command_stream_receiver_gen9.cpp +++ b/runtime/gen9/aub_command_stream_receiver_gen9.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/array_count.h" #include "runtime/helpers/base_object.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -23,4 +23,4 @@ void populateFactoryTable>() { } template class AUBCommandStreamReceiverHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/aub_mapper.h b/runtime/gen9/aub_mapper.h index 77dee5143c..7fa540ba4a 100644 --- a/runtime/gen9/aub_mapper.h +++ b/runtime/gen9/aub_mapper.h @@ -9,7 +9,7 @@ #include "runtime/gen_common/aub_mapper_base.h" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { struct SKLFamily; template <> @@ -25,4 +25,4 @@ struct AUBFamilyMapper { typedef AubMemDump::AubDump AUB; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/aub_mem_dump_gen9.cpp b/runtime/gen9/aub_mem_dump_gen9.cpp index 682a043a5a..68437c7f51 100644 --- a/runtime/gen9/aub_mem_dump_gen9.cpp +++ b/runtime/gen9/aub_mem_dump_gen9.cpp @@ -25,7 +25,7 @@ template struct AubPageTableHelper32>; template struct AubPageTableHelper64>; } // namespace AubMemDump -namespace OCLRT { +namespace NEO { using Family = SKLFamily; static const AubMemDump::LrcaHelperRcs rcs(0x002000); @@ -76,10 +76,10 @@ const MMIOList *AUBFamilyMapper::perEngineMMIO[EngineType::NUM_ENGINES] &mmioListVCS, &mmioListVECS}; -} // namespace OCLRT +} // namespace NEO namespace AubAllocDump { -using namespace OCLRT; +using namespace NEO; template uint32_t getImageSurfaceTypeFromGmmResourceType(GMM_RESOURCE_TYPE gmmResourceType); diff --git a/runtime/gen9/buffer_gen9.cpp b/runtime/gen9/buffer_gen9.cpp index 5b622a24cd..11f86035a6 100644 --- a/runtime/gen9/buffer_gen9.cpp +++ b/runtime/gen9/buffer_gen9.cpp @@ -9,10 +9,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; #include "runtime/mem_obj/buffer_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/command_queue_gen9.cpp b/runtime/gen9/command_queue_gen9.cpp index fddf0ff976..251f1dd1c5 100644 --- a/runtime/gen9/command_queue_gen9.cpp +++ b/runtime/gen9/command_queue_gen9.cpp @@ -9,7 +9,7 @@ #include "runtime/command_queue/command_queue_hw.inl" #include "runtime/memory_manager/svm_memory_manager.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -22,4 +22,4 @@ void populateFactoryTable>() { commandQueueFactory[gfxCore] = CommandQueueHw::create; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/command_stream_receiver_hw_gen9.cpp b/runtime/gen9/command_stream_receiver_hw_gen9.cpp index fa5af7d7d0..97a32b8f34 100644 --- a/runtime/gen9/command_stream_receiver_hw_gen9.cpp +++ b/runtime/gen9/command_stream_receiver_hw_gen9.cpp @@ -11,7 +11,7 @@ #include "hw_cmds.h" #include "hw_info.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -67,4 +67,4 @@ const Family::GPGPU_CSR_BASE_ADDRESS Family::cmdInitGpgpuCsrBaseAddress = Family const Family::STATE_SIP Family::cmdInitStateSip = Family::STATE_SIP::sInit(); const Family::BINDING_TABLE_STATE Family::cmdInitBindingTableState = Family::BINDING_TABLE_STATE::sInit(); const Family::MI_USER_INTERRUPT Family::cmdInitUserInterrupt = Family::MI_USER_INTERRUPT::sInit(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp b/runtime/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp index d8d2902dbd..a42416e527 100644 --- a/runtime/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp +++ b/runtime/gen9/command_stream_receiver_simulated_common_hw_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/command_stream/command_stream_receiver_simulated_common_hw.inl" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; template class CommandStreamReceiverSimulatedCommonHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/device_queue_gen9.cpp b/runtime/gen9/device_queue_gen9.cpp index 7c5537cf58..9218117c3e 100644 --- a/runtime/gen9/device_queue_gen9.cpp +++ b/runtime/gen9/device_queue_gen9.cpp @@ -10,7 +10,7 @@ #include "runtime/device_queue/device_queue_hw_profiling.inl" #include "runtime/gen9/hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -60,4 +60,4 @@ void DeviceQueueHw::addPipeControlCmdWa(bool isNoopCmd) { } template class DeviceQueueHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/enable_family_full_gen9.cpp b/runtime/gen9/enable_family_full_gen9.cpp index f1fed096b2..63c235fcb5 100644 --- a/runtime/gen9/enable_family_full_gen9.cpp +++ b/runtime/gen9/enable_family_full_gen9.cpp @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; @@ -42,4 +42,4 @@ struct EnableGen9 { }; static EnableGen9 enable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/enable_gen9.cpp b/runtime/gen9/enable_gen9.cpp index 09cdd1a150..f9f8d36095 100644 --- a/runtime/gen9/enable_gen9.cpp +++ b/runtime/gen9/enable_gen9.cpp @@ -10,7 +10,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BXT static EnableGfxProductHw enableGfxProductHwBXT; @@ -28,4 +28,4 @@ static EnableGfxProductHw enableGfxProductHwKBL; static EnableGfxProductHw enableGfxProductHwSKL; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/enable_hw_info_config_gen9.cpp b/runtime/gen9/enable_hw_info_config_gen9.cpp index 21977b46a5..bf1c49b6ac 100644 --- a/runtime/gen9/enable_hw_info_config_gen9.cpp +++ b/runtime/gen9/enable_hw_info_config_gen9.cpp @@ -9,7 +9,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BXT static EnableProductHwInfoConfig enableBXT; @@ -27,4 +27,4 @@ static EnableProductHwInfoConfig enableKBL; static EnableProductHwInfoConfig enableSKL; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/experimental_command_buffer_gen9.cpp b/runtime/gen9/experimental_command_buffer_gen9.cpp index 95acbd52f1..e66626a702 100644 --- a/runtime/gen9/experimental_command_buffer_gen9.cpp +++ b/runtime/gen9/experimental_command_buffer_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/command_stream/experimental_command_buffer.inl" #include "runtime/helpers/hw_helper.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily GfxFamily; template void ExperimentalCommandBuffer::injectBufferStart(LinearStream &parentStream, size_t cmdBufferOffset); @@ -23,4 +23,4 @@ template size_t ExperimentalCommandBuffer::getTimeStampPipeControlSize(); template size_t ExperimentalCommandBuffer::getExperimentalCommandsSize() noexcept; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/gpgpu_walker_gen9.cpp b/runtime/gen9/gpgpu_walker_gen9.cpp index f868fa47da..5dfe8d375e 100644 --- a/runtime/gen9/gpgpu_walker_gen9.cpp +++ b/runtime/gen9/gpgpu_walker_gen9.cpp @@ -13,10 +13,10 @@ #include "runtime/command_queue/hardware_interface_base.inl" #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { template <> -void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(OCLRT::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { +void GpgpuWalkerHelper::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) { if (disablePerfMode) { if (kernel.getKernelInfo().patchInfo.executionEnvironment->UsesFencesForReadWriteImages) { // Set bit L3SQC_BIT_LQSC_RO_PERF_DIS in L3SQC_REG4 @@ -61,4 +61,4 @@ template class GpgpuWalkerHelper; template struct EnqueueOperation; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/gtpin_setup_gen9.cpp b/runtime/gen9/gtpin_setup_gen9.cpp index 1ac2cd1c1d..72e027adec 100644 --- a/runtime/gen9/gtpin_setup_gen9.cpp +++ b/runtime/gen9/gtpin_setup_gen9.cpp @@ -10,7 +10,7 @@ #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" -namespace OCLRT { +namespace NEO { extern GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE]; @@ -32,4 +32,4 @@ struct GTPinEnableGen9 { static GTPinEnableGen9 gtpinEnable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_base.h b/runtime/gen9/hw_cmds_base.h index 95950b9265..fba0a6d0d3 100644 --- a/runtime/gen9/hw_cmds_base.h +++ b/runtime/gen9/hw_cmds_base.h @@ -17,7 +17,7 @@ template struct CmdParse; -namespace OCLRT { +namespace NEO { struct GEN9 { #include "runtime/gen9/hw_cmds_generated.h" @@ -62,4 +62,4 @@ struct SKLFamily : public GEN9 { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_bxt.h b/runtime/gen9/hw_cmds_bxt.h index db8ca43f9c..58ada06daa 100644 --- a/runtime/gen9/hw_cmds_bxt.h +++ b/runtime/gen9/hw_cmds_bxt.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { struct BXT : public SKLFamily { static const PLATFORM platform; @@ -40,4 +40,4 @@ class BXT_1x3x6 : public BXT { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_cfl.h b/runtime/gen9/hw_cmds_cfl.h index 2dd1ebd942..2a2a8d3ddf 100644 --- a/runtime/gen9/hw_cmds_cfl.h +++ b/runtime/gen9/hw_cmds_cfl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { struct CFL : public SKLFamily { static const PLATFORM platform; @@ -67,4 +67,4 @@ class CFL_3x3x8 : public CFL { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_glk.h b/runtime/gen9/hw_cmds_glk.h index 609f046c51..6a33c0f1e3 100644 --- a/runtime/gen9/hw_cmds_glk.h +++ b/runtime/gen9/hw_cmds_glk.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { struct GLK : public SKLFamily { static const PLATFORM platform; @@ -40,4 +40,4 @@ class GLK_1x2x6 : public GLK { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_kbl.h b/runtime/gen9/hw_cmds_kbl.h index 27a6f9bc01..007bff1e07 100644 --- a/runtime/gen9/hw_cmds_kbl.h +++ b/runtime/gen9/hw_cmds_kbl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { struct KBL : public SKLFamily { static const PLATFORM platform; @@ -67,4 +67,4 @@ class KBL_3x3x8 : public KBL { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_cmds_skl.h b/runtime/gen9/hw_cmds_skl.h index 34d12c767e..5bec22ed59 100644 --- a/runtime/gen9/hw_cmds_skl.h +++ b/runtime/gen9/hw_cmds_skl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen9/hw_cmds_base.h" -namespace OCLRT { +namespace NEO { struct SKL : public SKLFamily { static const PLATFORM platform; @@ -67,4 +67,4 @@ class SKL_3x3x8 : public SKL { private: static GT_SYSTEM_INFO gtSystemInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_helper_gen9.cpp b/runtime/gen9/hw_helper_gen9.cpp index 31d8fdb2a6..f32c04f5fe 100644 --- a/runtime/gen9/hw_helper_gen9.cpp +++ b/runtime/gen9/hw_helper_gen9.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_helper_common.inl" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; template <> @@ -32,4 +32,4 @@ template class AubHelperHw; template class HwHelperHw; template class FlatBatchBufferHelperHw; template struct PipeControlHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_bxt.h b/runtime/gen9/hw_info_bxt.h index 0d04cbc8b2..65c32ad5d1 100644 --- a/runtime/gen9/hw_info_bxt.h +++ b/runtime/gen9/hw_info_bxt.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ + #pragma once #include "hw_info_gen9.h" -namespace OCLRT { +namespace NEO { struct BXT; @@ -34,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef BXT GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_bxt.inl b/runtime/gen9/hw_info_bxt.inl index 56d9cddc80..51a345a53d 100644 --- a/runtime/gen9/hw_info_bxt.inl +++ b/runtime/gen9/hw_info_bxt.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info_bxt.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "bxt"; @@ -142,4 +142,4 @@ void setupBXTHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*BXT::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupBXTHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_cfl.h b/runtime/gen9/hw_info_cfl.h index 237c21c058..c3ae767713 100644 --- a/runtime/gen9/hw_info_cfl.h +++ b/runtime/gen9/hw_info_cfl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "hw_info_gen9.h" -namespace OCLRT { +namespace NEO { struct CFL; @@ -20,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef CFL GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_cfl.inl b/runtime/gen9/hw_info_cfl.inl index d48e1cbd78..da8853520d 100644 --- a/runtime/gen9/hw_info_cfl.inl +++ b/runtime/gen9/hw_info_cfl.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info_cfl.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "cfl"; @@ -230,4 +230,4 @@ void setupCFLHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*CFL::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupCFLHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_gen9.cpp b/runtime/gen9/hw_info_gen9.cpp index 6da7639dfc..343d0eeda1 100644 --- a/runtime/gen9/hw_info_gen9.cpp +++ b/runtime/gen9/hw_info_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -21,6 +21,6 @@ #include "hw_info_skl.inl" #endif -namespace OCLRT { +namespace NEO { const char *GfxFamilyMapper::name = "Gen9"; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_gen9.h b/runtime/gen9/hw_info_gen9.h index c49e1a163d..daf9b97780 100644 --- a/runtime/gen9/hw_info_gen9.h +++ b/runtime/gen9/hw_info_gen9.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ + #pragma once #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { struct SKLFamily; @@ -31,4 +17,4 @@ struct GfxFamilyMapper { typedef SKLFamily GfxFamily; static const char *name; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_glk.h b/runtime/gen9/hw_info_glk.h index 1cfce6db6b..6daf64f6fb 100644 --- a/runtime/gen9/hw_info_glk.h +++ b/runtime/gen9/hw_info_glk.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ + #pragma once #include "hw_info_gen9.h" -namespace OCLRT { +namespace NEO { struct GLK; @@ -34,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef GLK GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_glk.inl b/runtime/gen9/hw_info_glk.inl index 9e98142e97..e5af336aae 100644 --- a/runtime/gen9/hw_info_glk.inl +++ b/runtime/gen9/hw_info_glk.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info_glk.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "glk"; @@ -137,4 +137,4 @@ void setupGLKHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*GLK::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupGLKHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_kbl.h b/runtime/gen9/hw_info_kbl.h index c550bc1a52..b0f9fb891d 100644 --- a/runtime/gen9/hw_info_kbl.h +++ b/runtime/gen9/hw_info_kbl.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ + #pragma once #include "hw_info_gen9.h" -namespace OCLRT { +namespace NEO { struct KBL; @@ -34,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef KBL GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_kbl.inl b/runtime/gen9/hw_info_kbl.inl index 5827af8fd6..f6f95608c9 100644 --- a/runtime/gen9/hw_info_kbl.inl +++ b/runtime/gen9/hw_info_kbl.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info_kbl.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "kbl"; @@ -230,4 +230,4 @@ void setupKBLHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*KBL::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupKBLHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_skl.h b/runtime/gen9/hw_info_skl.h index a53f19e40d..666cbd8e7a 100644 --- a/runtime/gen9/hw_info_skl.h +++ b/runtime/gen9/hw_info_skl.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ + #pragma once #include "hw_info_gen9.h" -namespace OCLRT { +namespace NEO { struct SKL; @@ -34,4 +20,4 @@ struct HwMapper { typedef GfxFamilyMapper(gfxFamily)>::GfxFamily GfxFamily; typedef SKL GfxProduct; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/hw_info_skl.inl b/runtime/gen9/hw_info_skl.inl index d0e87ba600..aee82a94cb 100644 --- a/runtime/gen9/hw_info_skl.inl +++ b/runtime/gen9/hw_info_skl.inl @@ -12,7 +12,7 @@ #include "hw_cmds.h" #include "hw_info_skl.h" -namespace OCLRT { +namespace NEO { const char *HwMapper::abbreviation = "skl"; @@ -238,4 +238,4 @@ void setupSKLHardwareInfoImpl(GT_SYSTEM_INFO *gtSysInfo, FeatureTable *featureTa } void (*SKL::setupHardwareInfo)(GT_SYSTEM_INFO *, FeatureTable *, bool, const std::string &) = setupSKLHardwareInfoImpl; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/image_gen9.cpp b/runtime/gen9/image_gen9.cpp index fca146f359..585fcad87a 100644 --- a/runtime/gen9/image_gen9.cpp +++ b/runtime/gen9/image_gen9.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -41,4 +41,4 @@ void ImageHw::setSurfaceMemoryObjectControlStateIndexToMocsTable(void } #include "runtime/mem_obj/image_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/kernel_commands_gen9.cpp b/runtime/gen9/kernel_commands_gen9.cpp index f4edd8b583..998487a8c8 100644 --- a/runtime/gen9/kernel_commands_gen9.cpp +++ b/runtime/gen9/kernel_commands_gen9.cpp @@ -13,10 +13,10 @@ #include -namespace OCLRT { +namespace NEO { template <> bool KernelCommandsHelper::isPipeControlWArequired() { return true; } template struct KernelCommandsHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/command_stream_receiver_gen9.cpp b/runtime/gen9/linux/command_stream_receiver_gen9.cpp index 0906348c39..0ecae5ff9b 100644 --- a/runtime/gen9/linux/command_stream_receiver_gen9.cpp +++ b/runtime/gen9/linux/command_stream_receiver_gen9.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/linux/device_command_stream.inl" #include "runtime/os_interface/linux/drm_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class DrmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/hw_info_config_bxt.inl b/runtime/gen9/linux/hw_info_config_bxt.inl index 7d4f2cf26c..7650649c4a 100644 --- a/runtime/gen9/linux/hw_info_config_bxt.inl +++ b/runtime/gen9/linux/hw_info_config_bxt.inl @@ -10,7 +10,7 @@ #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_interface.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -98,4 +98,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/hw_info_config_cfl.inl b/runtime/gen9/linux/hw_info_config_cfl.inl index 2362ff1cd0..11aee26c5b 100644 --- a/runtime/gen9/linux/hw_info_config_cfl.inl +++ b/runtime/gen9/linux/hw_info_config_cfl.inl @@ -8,7 +8,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -75,4 +75,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInf } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/hw_info_config_glk.inl b/runtime/gen9/linux/hw_info_config_glk.inl index 8c124d0e03..0c5050b882 100644 --- a/runtime/gen9/linux/hw_info_config_glk.inl +++ b/runtime/gen9/linux/hw_info_config_glk.inl @@ -10,7 +10,7 @@ #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_interface.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -89,4 +89,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInf } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/hw_info_config_kbl.inl b/runtime/gen9/linux/hw_info_config_kbl.inl index d8897f19ab..6605a07c4f 100644 --- a/runtime/gen9/linux/hw_info_config_kbl.inl +++ b/runtime/gen9/linux/hw_info_config_kbl.inl @@ -8,7 +8,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -82,4 +82,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/linux/hw_info_config_skl.inl b/runtime/gen9/linux/hw_info_config_skl.inl index ebdc082e2a..ccb21e59f0 100644 --- a/runtime/gen9/linux/hw_info_config_skl.inl +++ b/runtime/gen9/linux/hw_info_config_skl.inl @@ -9,7 +9,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -100,4 +100,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, } template class HwInfoConfigHw; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/preamble_gen9.cpp b/runtime/gen9/preamble_gen9.cpp index fa76b5bdd5..07991c02fd 100644 --- a/runtime/gen9/preamble_gen9.cpp +++ b/runtime/gen9/preamble_gen9.cpp @@ -8,7 +8,7 @@ #include "runtime/command_stream/csr_definitions.h" #include "runtime/helpers/preamble.inl" -namespace OCLRT { +namespace NEO { template <> uint32_t PreambleHelper::getL3Config(const HardwareInfo &hwInfo, bool useSLM) { @@ -78,4 +78,4 @@ size_t PreambleHelper::getThreadArbitrationCommandsSize() { } template struct PreambleHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/preemption_gen9.cpp b/runtime/gen9/preemption_gen9.cpp index b79adecbd6..0a25523cb5 100644 --- a/runtime/gen9/preemption_gen9.cpp +++ b/runtime/gen9/preemption_gen9.cpp @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { typedef SKLFamily GfxFamily; @@ -42,4 +42,4 @@ template size_t PreemptionHelper::getPreemptionWaCsSize(const Device template void PreemptionHelper::applyPreemptionWaCmdsBegin(LinearStream *pCommandStream, const Device &device); template void PreemptionHelper::applyPreemptionWaCmdsEnd(LinearStream *pCommandStream, const Device &device); template void PreemptionHelper::programInterfaceDescriptorDataPreemption(INTERFACE_DESCRIPTOR_DATA *idd, PreemptionMode preemptionMode); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/reg_configs.h b/runtime/gen9/reg_configs.h index 15c5c1bbc4..503f4face1 100644 --- a/runtime/gen9/reg_configs.h +++ b/runtime/gen9/reg_configs.h @@ -9,7 +9,7 @@ #include "runtime/command_stream/thread_arbitration_policy.h" #include "runtime/helpers/preamble.h" -namespace OCLRT { +namespace NEO { struct SKLFamily; template <> struct L3CNTLREGConfig { @@ -35,4 +35,4 @@ constexpr uint32_t getRegData(const uint32_t &policy) { }; } // namespace DebugControlReg2 -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/sampler_gen9.cpp b/runtime/gen9/sampler_gen9.cpp index 75e4549668..b7b5528c2b 100644 --- a/runtime/gen9/sampler_gen9.cpp +++ b/runtime/gen9/sampler_gen9.cpp @@ -10,10 +10,10 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; #include "runtime/sampler/sampler_factory_init.inl" -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/state_base_address_gen9.cpp b/runtime/gen9/state_base_address_gen9.cpp index bbcff047bd..9745302e4a 100644 --- a/runtime/gen9/state_base_address_gen9.cpp +++ b/runtime/gen9/state_base_address_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,6 @@ #include "runtime/helpers/state_base_address.h" #include "runtime/helpers/state_base_address.inl" -namespace OCLRT { +namespace NEO { template struct StateBaseAddressHelper; } diff --git a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp index 8f293e5f73..2213725c13 100644 --- a/runtime/gen9/tbx_command_stream_receiver_gen9.cpp +++ b/runtime/gen9/tbx_command_stream_receiver_gen9.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; static auto gfxCore = IGFX_GEN9_CORE; @@ -27,4 +27,4 @@ void populateFactoryTable>() { template class TbxCommandStreamReceiverHw; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/windows/command_stream_receiver_gen9.cpp b/runtime/gen9/windows/command_stream_receiver_gen9.cpp index 74fa9ea364..14e8c15a40 100644 --- a/runtime/gen9/windows/command_stream_receiver_gen9.cpp +++ b/runtime/gen9/windows/command_stream_receiver_gen9.cpp @@ -9,9 +9,9 @@ #include "runtime/os_interface/windows/device_command_stream.inl" #include "runtime/os_interface/windows/wddm_device_command_stream.inl" -namespace OCLRT { +namespace NEO { template class DeviceCommandStreamReceiver; template class WddmCommandStreamReceiver; template class CommandStreamReceiverWithAUBDump>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen9/windows/gmm_callbacks_gen9.cpp b/runtime/gen9/windows/gmm_callbacks_gen9.cpp index 022fce214d..6df075c2d6 100644 --- a/runtime/gen9/windows/gmm_callbacks_gen9.cpp +++ b/runtime/gen9/windows/gmm_callbacks_gen9.cpp @@ -10,7 +10,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; template struct DeviceCallbacks; template struct TTCallbacks; diff --git a/runtime/gen9/windows/hw_info_config_gen9.cpp b/runtime/gen9/windows/hw_info_config_gen9.cpp index 157a4be80c..f3285bf96b 100644 --- a/runtime/gen9/windows/hw_info_config_gen9.cpp +++ b/runtime/gen9/windows/hw_info_config_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/hw_info_config.inl" -namespace OCLRT { +namespace NEO { #ifdef SUPPORT_BXT template <> @@ -52,4 +52,4 @@ int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, template class HwInfoConfigHw; #endif -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen_common/aub_mapper_base.h b/runtime/gen_common/aub_mapper_base.h index 0e4c011d49..a10e8c47f0 100644 --- a/runtime/gen_common/aub_mapper_base.h +++ b/runtime/gen_common/aub_mapper_base.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { template struct AUBFamilyMapper { @@ -20,4 +20,4 @@ struct AUBFamilyMapper { using MMIOPair = std::pair; using MMIOList = std::vector; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gen_common/reg_configs/reg_configs_common.h b/runtime/gen_common/reg_configs/reg_configs_common.h index efb55456af..7b3f710dd4 100644 --- a/runtime/gen_common/reg_configs/reg_configs_common.h +++ b/runtime/gen_common/reg_configs/reg_configs_common.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ #include -namespace OCLRT { +namespace NEO { namespace RowChickenReg4 { const uint32_t address = 0xE48C; const uint32_t regDataForArbitrationPolicy[3] = { @@ -37,4 +37,4 @@ constexpr uint32_t maskUpdate = regUpdate << maskShift; constexpr uint32_t regVal = regUpdate | maskUpdate; } // namespace FfSliceCsChknReg2 -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/client_context/gmm_client_context.cpp b/runtime/gmm_helper/client_context/gmm_client_context.cpp index 868f79a134..9378b835fe 100644 --- a/runtime/gmm_helper/client_context/gmm_client_context.cpp +++ b/runtime/gmm_helper/client_context/gmm_client_context.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,6 @@ #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { GmmClientContext::GmmClientContext(GMM_CLIENT clientType, GmmExportEntries &gmmEntries) : GmmClientContextBase(clientType, gmmEntries){}; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/client_context/gmm_client_context.h b/runtime/gmm_helper/client_context/gmm_client_context.h index c9fa94f7eb..328dffa50c 100644 --- a/runtime/gmm_helper/client_context/gmm_client_context.h +++ b/runtime/gmm_helper/client_context/gmm_client_context.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #pragma once #include "runtime/gmm_helper/client_context/gmm_client_context_base.h" -namespace OCLRT { +namespace NEO { class GmmClientContext : public GmmClientContextBase { public: GmmClientContext(GMM_CLIENT clientType, GmmExportEntries &gmmEntries); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp index c954ca335f..02e881219e 100644 --- a/runtime/gmm_helper/client_context/gmm_client_context_base.cpp +++ b/runtime/gmm_helper/client_context/gmm_client_context_base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/gmm_helper/client_context/gmm_client_context_base.h" -namespace OCLRT { +namespace NEO { GmmClientContextBase::GmmClientContextBase(GMM_CLIENT clientType, GmmExportEntries &gmmEntries) : gmmEntries(gmmEntries) { clientContext = gmmEntries.pfnCreateClientContext(clientType); } @@ -34,4 +34,4 @@ void GmmClientContextBase::destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo) { GMM_CLIENT_CONTEXT *GmmClientContextBase::getHandle() const { return clientContext; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/client_context/gmm_client_context_base.h b/runtime/gmm_helper/client_context/gmm_client_context_base.h index 4155d97c59..a5f6efdeaa 100644 --- a/runtime/gmm_helper/client_context/gmm_client_context_base.h +++ b/runtime/gmm_helper/client_context/gmm_client_context_base.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class GmmClientContext; class GmmClientContextBase { public: @@ -32,4 +32,4 @@ class GmmClientContextBase { GmmClientContextBase(GMM_CLIENT clientType, GmmExportEntries &gmmEntries); GmmExportEntries &gmmEntries; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm.cpp b/runtime/gmm_helper/gmm.cpp index 476d7f4d1d..7a80483705 100644 --- a/runtime/gmm_helper/gmm.cpp +++ b/runtime/gmm_helper/gmm.cpp @@ -16,7 +16,7 @@ #include "runtime/helpers/ptr_math.h" #include "runtime/helpers/surface_formats.h" -namespace OCLRT { +namespace NEO { Gmm::Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable) : Gmm(alignedPtr, alignedSize, uncacheable, false, true, {}) {} Gmm::Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable, bool preferRenderCompressed, bool systemMemoryPool, StorageInfo storageInfo) { @@ -260,4 +260,4 @@ uint32_t Gmm::getUnifiedAuxPitchTiles() { uint32_t Gmm::getAuxQPitch() { return this->gmmResourceInfo->getAuxQPitch(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm.h b/runtime/gmm_helper/gmm.h index 11cb1d1796..e603f3810e 100644 --- a/runtime/gmm_helper/gmm.h +++ b/runtime/gmm_helper/gmm.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { enum class OCLPlane; struct HardwareInfo; struct ImageInfo; @@ -55,4 +55,4 @@ class Gmm { bool isRenderCompressed = false; bool useSystemMemoryPool = true; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_helper.cpp b/runtime/gmm_helper/gmm_helper.cpp index 411732be54..9119a7b18a 100644 --- a/runtime/gmm_helper/gmm_helper.cpp +++ b/runtime/gmm_helper/gmm_helper.cpp @@ -22,7 +22,7 @@ #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { GmmClientContext *GmmHelper::getClientContext() { return getInstance()->gmmClientContext.get(); @@ -149,4 +149,4 @@ GmmHelper::~GmmHelper() { gmmEntries.pfnDestroySingletonContext(); }; decltype(GmmHelper::createGmmContextWrapperFunc) GmmHelper::createGmmContextWrapperFunc = GmmClientContextBase::create; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_helper.h b/runtime/gmm_helper/gmm_helper.h index 4561e2f46c..ef60e65bf0 100644 --- a/runtime/gmm_helper/gmm_helper.h +++ b/runtime/gmm_helper/gmm_helper.h @@ -13,7 +13,7 @@ #include #include -namespace OCLRT { +namespace NEO { enum class OCLPlane; struct HardwareInfo; struct FeatureTable; @@ -63,4 +63,4 @@ class GmmHelper { std::unique_ptr gmmClientContext; GmmExportEntries gmmEntries = {}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_interface.cpp b/runtime/gmm_helper/gmm_interface.cpp index 4763163139..4f0edb84ba 100644 --- a/runtime/gmm_helper/gmm_interface.cpp +++ b/runtime/gmm_helper/gmm_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ extern const char *gmmDllName; extern const char *gmmEntryName; } // namespace Os -namespace OCLRT { +namespace NEO { void GmmHelper::loadLib() { gmmLib.reset(OsLibrary::load(Os::gmmDllName)); @@ -30,4 +30,4 @@ void GmmHelper::loadLib() { } UNRECOVERABLE_IF(!isLoaded); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_memory.cpp b/runtime/gmm_helper/gmm_memory.cpp index 064e612c47..eb4f90c108 100644 --- a/runtime/gmm_helper/gmm_memory.cpp +++ b/runtime/gmm_helper/gmm_memory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "gmm_memory.h" -namespace OCLRT { +namespace NEO { GmmMemory *GmmMemory::create() { return new GmmMemory(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_memory/gmm_memory.h b/runtime/gmm_helper/gmm_memory/gmm_memory.h index a42c109f31..94a20a0cf3 100644 --- a/runtime/gmm_helper/gmm_memory/gmm_memory.h +++ b/runtime/gmm_helper/gmm_memory/gmm_memory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gmm_helper/gmm_memory_base.h" -namespace OCLRT { +namespace NEO { class GmmMemory : public GmmMemoryBase { public: static GmmMemory *create(); @@ -17,4 +17,4 @@ class GmmMemory : public GmmMemoryBase { protected: GmmMemory() = default; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_memory_base.cpp b/runtime/gmm_helper/gmm_memory_base.cpp index 2192021e1f..79762cb77a 100644 --- a/runtime/gmm_helper/gmm_memory_base.cpp +++ b/runtime/gmm_helper/gmm_memory_base.cpp @@ -12,7 +12,7 @@ #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { GmmMemoryBase::GmmMemoryBase() { clientContext = GmmHelper::getClientContext()->getHandle(); } @@ -43,4 +43,4 @@ bool GmmMemoryBase::configureDevice(GMM_ESCAPE_HANDLE hAdapter, minAddress = windowsMinAddress; return configureDeviceAddressSpace(hAdapter, hDevice, pfnEscape, SvmSize, BDWL3Coherency); } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/gmm_helper/gmm_memory_base.h b/runtime/gmm_helper/gmm_memory_base.h index 2264e30378..4b7dd89482 100644 --- a/runtime/gmm_helper/gmm_memory_base.h +++ b/runtime/gmm_helper/gmm_memory_base.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class GmmMemoryBase { public: virtual ~GmmMemoryBase() = default; @@ -33,4 +33,4 @@ class GmmMemoryBase { GmmMemoryBase(); GMM_CLIENT_CONTEXT *clientContext = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/gmm_utils.cpp b/runtime/gmm_helper/gmm_utils.cpp index acebba2d52..1b94d8a300 100644 --- a/runtime/gmm_helper/gmm_utils.cpp +++ b/runtime/gmm_helper/gmm_utils.cpp @@ -14,8 +14,8 @@ #include "GL/gl.h" #include "GL/glext.h" -using namespace OCLRT; -namespace OCLRT { +using namespace NEO; +namespace NEO { GMM_CUBE_FACE_ENUM GmmHelper::getCubeFaceIndex(uint32_t target) { switch (target) { case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: @@ -33,7 +33,7 @@ GMM_CUBE_FACE_ENUM GmmHelper::getCubeFaceIndex(uint32_t target) { } return __GMM_NO_CUBE_MAP; } -} // namespace OCLRT +} // namespace NEO void Gmm::applyAuxFlagsForImage(ImageInfo &imgInfo) {} void Gmm::applyAuxFlagsForBuffer(bool preferRenderCompression) {} diff --git a/runtime/gmm_helper/page_table_mngr.cpp b/runtime/gmm_helper/page_table_mngr.cpp index 1adb341bed..36a4700993 100644 --- a/runtime/gmm_helper/page_table_mngr.cpp +++ b/runtime/gmm_helper/page_table_mngr.cpp @@ -7,9 +7,9 @@ #include "runtime/gmm_helper/page_table_mngr.h" -namespace OCLRT { +namespace NEO { GmmPageTableMngr *GmmPageTableMngr::create(GMM_DEVICE_CALLBACKS_INT *deviceCb, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) { return new GmmPageTableMngr(deviceCb, translationTableFlags, translationTableCb); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/page_table_mngr.h b/runtime/gmm_helper/page_table_mngr.h index b9acabea2e..10e52cc024 100644 --- a/runtime/gmm_helper/page_table_mngr.h +++ b/runtime/gmm_helper/page_table_mngr.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GmmPageTableMngr { public: MOCKABLE_VIRTUAL ~GmmPageTableMngr(); @@ -37,4 +37,4 @@ class GmmPageTableMngr { GMM_CLIENT_CONTEXT *clientContext = nullptr; GMM_PAGETABLE_MGR *pageTableManager = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/page_table_mngr_impl.cpp b/runtime/gmm_helper/page_table_mngr_impl.cpp index bf8efee70a..80ec7e2d13 100644 --- a/runtime/gmm_helper/page_table_mngr_impl.cpp +++ b/runtime/gmm_helper/page_table_mngr_impl.cpp @@ -10,7 +10,7 @@ #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { GmmPageTableMngr::~GmmPageTableMngr() { if (clientContext) { clientContext->DestroyPageTblMgrObject(pageTableManager); @@ -22,4 +22,4 @@ GmmPageTableMngr::GmmPageTableMngr(GMM_DEVICE_CALLBACKS_INT *deviceCb, unsigned pageTableManager = clientContext->CreatePageTblMgrObject(deviceCb, translationTableCb, translationTableFlags); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/resource_info.cpp b/runtime/gmm_helper/resource_info.cpp index d5f2884d05..8240559a0f 100644 --- a/runtime/gmm_helper/resource_info.cpp +++ b/runtime/gmm_helper/resource_info.cpp @@ -1,28 +1,13 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #include "runtime/gmm_helper/resource_info.h" -namespace OCLRT { +namespace NEO { GmmResourceInfo *GmmResourceInfo::create(GMM_RESCREATE_PARAMS *resourceCreateParams) { return new GmmResourceInfo(resourceCreateParams); } @@ -30,4 +15,4 @@ GmmResourceInfo *GmmResourceInfo::create(GMM_RESCREATE_PARAMS *resourceCreatePar GmmResourceInfo *GmmResourceInfo::create(GMM_RESOURCE_INFO *inputGmmResourceInfo) { return new GmmResourceInfo(inputGmmResourceInfo); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/resource_info.h b/runtime/gmm_helper/resource_info.h index aeda6375ba..1c45ec9078 100644 --- a/runtime/gmm_helper/resource_info.h +++ b/runtime/gmm_helper/resource_info.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GmmResourceInfo { public: static GmmResourceInfo *create(GMM_RESCREATE_PARAMS *resourceCreateParams); @@ -82,4 +82,4 @@ class GmmResourceInfo { UniquePtrType resourceInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gmm_helper/resource_info_impl.cpp b/runtime/gmm_helper/resource_info_impl.cpp index ad8184cc6d..34140459b4 100644 --- a/runtime/gmm_helper/resource_info_impl.cpp +++ b/runtime/gmm_helper/resource_info_impl.cpp @@ -10,7 +10,7 @@ #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { void GmmResourceInfo::customDeleter(GMM_RESOURCE_INFO *gmmResourceInfo) { GmmHelper::getClientContext()->destroyResInfoObject(gmmResourceInfo); } @@ -25,4 +25,4 @@ GmmResourceInfo::GmmResourceInfo(GMM_RESOURCE_INFO *inputGmmResourceInfo) { this->resourceInfo = UniquePtrType(resourceInfoPtr, GmmResourceInfo::customDeleter); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_callback_stubs.cpp b/runtime/gtpin/gtpin_callback_stubs.cpp index 994c50c9f2..03982fb808 100644 --- a/runtime/gtpin/gtpin_callback_stubs.cpp +++ b/runtime/gtpin/gtpin_callback_stubs.cpp @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { bool isGTPinInitialized = false; void gtpinNotifyContextCreate(cl_context context) { @@ -52,4 +52,4 @@ void setIgcInfo(const void *igcInfo) { const void *gtpinGetIgcInfo() { return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_callbacks.cpp b/runtime/gtpin/gtpin_callbacks.cpp index 94893a2870..eb9f2031f1 100644 --- a/runtime/gtpin/gtpin_callbacks.cpp +++ b/runtime/gtpin/gtpin_callbacks.cpp @@ -28,7 +28,7 @@ using namespace gtpin; -namespace OCLRT { +namespace NEO { extern gtpin::ocl::gtpin_events_t GTPinCallbacks; @@ -230,4 +230,4 @@ void gtpinNotifyPlatformShutdown() { void *gtpinGetIgcInit() { return pIgcInit; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_defs.h b/runtime/gtpin/gtpin_defs.h index 452852dda3..545f3c67c5 100644 --- a/runtime/gtpin/gtpin_defs.h +++ b/runtime/gtpin/gtpin_defs.h @@ -11,7 +11,7 @@ #include "CL/cl.h" #include "ocl_igc_shared/gtpin/gtpin_ocl_interface.h" -namespace OCLRT { +namespace NEO { struct GTPinKernelExec { Kernel *pKernel; @@ -34,4 +34,4 @@ struct GTPinKernelExec { }; typedef struct GTPinKernelExec gtpinkexec_t; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_helpers.cpp b/runtime/gtpin/gtpin_helpers.cpp index fb58ba7b62..15f13e1e03 100644 --- a/runtime/gtpin/gtpin_helpers.cpp +++ b/runtime/gtpin/gtpin_helpers.cpp @@ -17,7 +17,7 @@ using namespace gtpin; -namespace OCLRT { +namespace NEO { GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinCreateBuffer(context_handle_t context, uint32_t reqSize, resource_handle_t *pResource) { cl_int diag = CL_SUCCESS; @@ -76,4 +76,4 @@ GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinUnmapBuffer(context_handle_t context, } return GTPIN_DI_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_helpers.h b/runtime/gtpin/gtpin_helpers.h index 7736e38ecb..fafd074ac7 100644 --- a/runtime/gtpin/gtpin_helpers.h +++ b/runtime/gtpin/gtpin_helpers.h @@ -9,9 +9,9 @@ #include "ocl_igc_shared/gtpin/gtpin_driver_common.h" -namespace OCLRT { +namespace NEO { gtpin::GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinCreateBuffer(gtpin::context_handle_t context, uint32_t size, gtpin::resource_handle_t *pResource); gtpin::GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinFreeBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource); gtpin::GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinMapBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource, uint8_t **pAddress); gtpin::GTPIN_DI_STATUS GTPIN_DRIVER_CALLCONV gtpinUnmapBuffer(gtpin::context_handle_t context, gtpin::resource_handle_t resource); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_hw_helper.cpp b/runtime/gtpin/gtpin_hw_helper.cpp index bf5f1fce25..037eea2c95 100644 --- a/runtime/gtpin/gtpin_hw_helper.cpp +++ b/runtime/gtpin/gtpin_hw_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "runtime/gtpin/gtpin_hw_helper.h" -namespace OCLRT { +namespace NEO { GTPinHwHelper *gtpinHwHelperFactory[IGFX_MAX_CORE] = {}; GTPinHwHelper >PinHwHelper::get(GFXCORE_FAMILY gfxCore) { return *gtpinHwHelperFactory[gfxCore]; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_hw_helper.h b/runtime/gtpin/gtpin_hw_helper.h index 98c1a45a5d..c86b9e73be 100644 --- a/runtime/gtpin/gtpin_hw_helper.h +++ b/runtime/gtpin/gtpin_hw_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/gen_common/hw_cmds.h" -namespace OCLRT { +namespace NEO { class Kernel; class GTPinHwHelper { @@ -36,4 +36,4 @@ class GTPinHwHelperHw : public GTPinHwHelper { private: GTPinHwHelperHw(){}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_hw_helper.inl b/runtime/gtpin/gtpin_hw_helper.inl index d01f6671fb..c9ad8b4605 100644 --- a/runtime/gtpin/gtpin_hw_helper.inl +++ b/runtime/gtpin/gtpin_hw_helper.inl @@ -11,7 +11,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template bool GTPinHwHelperHw::addSurfaceState(Kernel *pKernel) { @@ -55,4 +55,4 @@ void *GTPinHwHelperHw::getSurfaceState(Kernel *pKernel, size_t bti) { return pSurfaceState; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/gtpin/gtpin_init.cpp b/runtime/gtpin/gtpin_init.cpp index fa3ef164fb..f6579357c6 100644 --- a/runtime/gtpin/gtpin_init.cpp +++ b/runtime/gtpin/gtpin_init.cpp @@ -15,12 +15,12 @@ #include "gtpin_helpers.h" using namespace gtpin; -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { bool isGTPinInitialized = false; gtpin::ocl::gtpin_events_t GTPinCallbacks = {0}; -} // namespace OCLRT +} // namespace NEO GTPIN_DI_STATUS GTPin_Init(gtpin::ocl::gtpin_events_t *pGtpinEvents, driver_services_t *pDriverServices, interface_version_t *pDriverVersion) { @@ -48,10 +48,10 @@ GTPIN_DI_STATUS GTPin_Init(gtpin::ocl::gtpin_events_t *pGtpinEvents, driver_serv return GTPIN_DI_ERROR_INVALID_ARGUMENT; } - pDriverServices->bufferAllocate = OCLRT::gtpinCreateBuffer; - pDriverServices->bufferDeallocate = OCLRT::gtpinFreeBuffer; - pDriverServices->bufferMap = OCLRT::gtpinMapBuffer; - pDriverServices->bufferUnMap = OCLRT::gtpinUnmapBuffer; + pDriverServices->bufferAllocate = NEO::gtpinCreateBuffer; + pDriverServices->bufferDeallocate = NEO::gtpinFreeBuffer; + pDriverServices->bufferMap = NEO::gtpinMapBuffer; + pDriverServices->bufferUnMap = NEO::gtpinUnmapBuffer; GTPinCallbacks = *pGtpinEvents; isGTPinInitialized = true; diff --git a/runtime/gtpin/gtpin_notify.h b/runtime/gtpin/gtpin_notify.h index 399aeff8d3..b916b38998 100644 --- a/runtime/gtpin/gtpin_notify.h +++ b/runtime/gtpin/gtpin_notify.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { extern bool isGTPinInitialized; void gtpinNotifyContextCreate(cl_context context); @@ -26,4 +26,4 @@ void gtpinNotifyUpdateResidencyList(void *pKernel, void *pResidencyVector); void gtpinNotifyPlatformShutdown(); inline bool gtpinIsGTPinInitialized() { return isGTPinInitialized; } void *gtpinGetIgcInit(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/abort.cpp b/runtime/helpers/abort.cpp index eb836778c2..3c845017cb 100644 --- a/runtime/helpers/abort.cpp +++ b/runtime/helpers/abort.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,8 +9,8 @@ #include -namespace OCLRT { +namespace NEO { void abortExecution() { abort(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/abort.h b/runtime/helpers/abort.h index 70cb71daf5..bc53ee318b 100644 --- a/runtime/helpers/abort.h +++ b/runtime/helpers/abort.h @@ -1,27 +1,12 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -namespace OCLRT { +namespace NEO { [[noreturn]] void abortExecution(); } diff --git a/runtime/helpers/address_patch.h b/runtime/helpers/address_patch.h index f971602966..70c6ed911f 100644 --- a/runtime/helpers/address_patch.h +++ b/runtime/helpers/address_patch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { enum PatchInfoAllocationType { Default = 0, @@ -76,4 +76,4 @@ struct CommandChunk { uint64_t batchBufferStartLocation = 0; uint64_t batchBufferStartAddress = 0; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/helpers/base_object.cpp b/runtime/helpers/base_object.cpp index 9008cb5bc7..6e5d209f91 100644 --- a/runtime/helpers/base_object.cpp +++ b/runtime/helpers/base_object.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/helpers/base_object.h" -namespace OCLRT { +namespace NEO { std::thread::id invalidThreadID; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/base_object.h b/runtime/helpers/base_object.h index 9aff7b2f52..f49a6904ac 100644 --- a/runtime/helpers/base_object.h +++ b/runtime/helpers/base_object.h @@ -19,7 +19,7 @@ #include #include -namespace OCLRT { +namespace NEO { #if defined(__clang__) #define NO_SANITIZE __attribute__((no_sanitize("undefined"))) @@ -257,4 +257,4 @@ class BaseObject : public B, public ReferenceTrackedObject> { template void populateFactoryTable(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/base_object_allocator.cpp b/runtime/helpers/base_object_allocator.cpp index 873a69f0f7..f560f4b34c 100644 --- a/runtime/helpers/base_object_allocator.cpp +++ b/runtime/helpers/base_object_allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -23,7 +23,7 @@ // *** Any additional logic or dependencies may break this feature *** // // *********************************************************************** // -namespace OCLRT { +namespace NEO { template void *BaseObject::operator new(size_t sz) { @@ -56,4 +56,4 @@ template class BaseObject<_cl_mem>; template class BaseObject<_cl_platform_id>; template class BaseObject<_cl_program>; template class BaseObject<_cl_sampler>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/built_ins_helper.cpp b/runtime/helpers/built_ins_helper.cpp index 7cfec4549e..c63ba760fc 100644 --- a/runtime/helpers/built_ins_helper.cpp +++ b/runtime/helpers/built_ins_helper.cpp @@ -10,7 +10,7 @@ #include "runtime/execution_environment/execution_environment.h" #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { const SipKernel &initSipKernel(SipKernelType type, Device &device) { return device.getExecutionEnvironment()->getBuiltIns()->getSipKernel(type, device); } @@ -30,4 +30,4 @@ Program *createProgramForSip(ExecutionEnvironment &executionEnvironment, DEBUG_BREAK_IF(retVal != 0); return program; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/built_ins_helper.h b/runtime/helpers/built_ins_helper.h index ee9dd2e989..2c2129790e 100644 --- a/runtime/helpers/built_ins_helper.h +++ b/runtime/helpers/built_ins_helper.h @@ -9,7 +9,7 @@ #include "runtime/built_ins/built_ins.h" #include "runtime/execution_environment/execution_environment.h" -namespace OCLRT { +namespace NEO { const SipKernel &initSipKernel(SipKernelType type, Device &device); Program *createProgramForSip(ExecutionEnvironment &executionEnvironment, @@ -17,4 +17,4 @@ Program *createProgramForSip(ExecutionEnvironment &executionEnvironment, std::vector &binary, size_t size, cl_int *errcodeRet); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/cache_policy.cpp b/runtime/helpers/cache_policy.cpp index ba34d18a7f..f514aab030 100644 --- a/runtime/helpers/cache_policy.cpp +++ b/runtime/helpers/cache_policy.cpp @@ -10,16 +10,16 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { bool isL3Capable(void *ptr, size_t size) { return isAligned(ptr) && isAligned(size); } -bool isL3Capable(const OCLRT::GraphicsAllocation &graphicsAllocation) { +bool isL3Capable(const NEO::GraphicsAllocation &graphicsAllocation) { auto ptr = ptrOffset(graphicsAllocation.getUnderlyingBuffer(), static_cast(graphicsAllocation.getAllocationOffset())); return isL3Capable(ptr, graphicsAllocation.getUnderlyingBufferSize()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/cache_policy.h b/runtime/helpers/cache_policy.h index aeb776f477..91fb2d3598 100644 --- a/runtime/helpers/cache_policy.h +++ b/runtime/helpers/cache_policy.h @@ -14,8 +14,8 @@ constexpr uint32_t l3CacheOff = GMM_RESOURCE_USAGE_OCL_BUFFER_CACHELINE_MISALIGN constexpr uint32_t unknownMocs = GMM_RESOURCE_USAGE_UNKNOWN; } // namespace CacheSettings -namespace OCLRT { +namespace NEO { class GraphicsAllocation; bool isL3Capable(void *ptr, size_t size); bool isL3Capable(const GraphicsAllocation &graphicsAllocation); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/cl_helper.h b/runtime/helpers/cl_helper.h index 50ff637b82..470a2eb73c 100644 --- a/runtime/helpers/cl_helper.h +++ b/runtime/helpers/cl_helper.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { inline const std::string cmdTypetoString(cl_command_type cmd) { switch (cmd) { case CL_COMMAND_NDRANGE_KERNEL: @@ -81,4 +81,4 @@ inline const std::string cmdTypetoString(cl_command_type cmd) { } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/completion_stamp.h b/runtime/helpers/completion_stamp.h index fcf394833b..261c968658 100644 --- a/runtime/helpers/completion_stamp.h +++ b/runtime/helpers/completion_stamp.h @@ -10,11 +10,11 @@ #include -namespace OCLRT { +namespace NEO { typedef uint64_t FlushStamp; struct CompletionStamp { uint32_t taskCount; uint32_t taskLevel; FlushStamp flushStamp; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/convert_color.h b/runtime/helpers/convert_color.h index d93e075150..99b34ef41d 100644 --- a/runtime/helpers/convert_color.h +++ b/runtime/helpers/convert_color.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { inline int32_t selectNormalizingFactor(const cl_channel_type &channelType) { if (channelType == CL_UNORM_INT8) { @@ -100,4 +100,4 @@ inline void convertFillColor(const void *fillColor, } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/csr_deps.cpp b/runtime/helpers/csr_deps.cpp index 80d459983b..9fb5141d9b 100644 --- a/runtime/helpers/csr_deps.cpp +++ b/runtime/helpers/csr_deps.cpp @@ -12,7 +12,7 @@ #include "runtime/helpers/properties_helper.h" #include "runtime/helpers/timestamp_packet.h" -namespace OCLRT { +namespace NEO { void CsrDependencies::fillFromEventsRequestAndMakeResident(const EventsRequest &eventsRequest, CommandStreamReceiver ¤tCsr, DependenciesType depsType) { @@ -35,4 +35,4 @@ void CsrDependencies::fillFromEventsRequestAndMakeResident(const EventsRequest & } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/csr_deps.h b/runtime/helpers/csr_deps.h index 5c072be2a7..81215b7935 100644 --- a/runtime/helpers/csr_deps.h +++ b/runtime/helpers/csr_deps.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/utilities/stackvec.h" -namespace OCLRT { +namespace NEO { class TimestampPacketContainer; class CommandStreamReceiver; @@ -25,4 +25,4 @@ class CsrDependencies : public StackVec { CommandStreamReceiver ¤tCsr, DependenciesType depsType); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/debug_helpers.cpp b/runtime/helpers/debug_helpers.cpp index 4516b61b17..457d113644 100644 --- a/runtime/helpers/debug_helpers.cpp +++ b/runtime/helpers/debug_helpers.cpp @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { void debugBreak(int line, const char *file) { if (DebugManager.flags.EnableDebugBreak.get()) { printf("Assert was called at %d line in file:\n%s\n", line, file); @@ -23,4 +23,4 @@ void abortUnrecoverable(int line, const char *file) { printf("Abort was called at %d line in file:\n%s\n", line, file); abortExecution(); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/helpers/debug_helpers.h b/runtime/helpers/debug_helpers.h index dbac3f4c95..3f7602147f 100644 --- a/runtime/helpers/debug_helpers.h +++ b/runtime/helpers/debug_helpers.h @@ -8,27 +8,27 @@ #pragma once #include "runtime/helpers/abort.h" -#define UNRECOVERABLE_IF(expression) \ - \ - if (expression) { \ - OCLRT::abortUnrecoverable(__LINE__, __FILE__); \ +#define UNRECOVERABLE_IF(expression) \ + \ + if (expression) { \ + NEO::abortUnrecoverable(__LINE__, __FILE__); \ } #define UNREACHABLE(...) std::abort() #ifndef DEBUG_BREAK_IF #ifdef _DEBUG -#define DEBUG_BREAK_IF(expression) \ - \ - if (expression) { \ - OCLRT::debugBreak(__LINE__, __FILE__); \ +#define DEBUG_BREAK_IF(expression) \ + \ + if (expression) { \ + NEO::debugBreak(__LINE__, __FILE__); \ } #else #define DEBUG_BREAK_IF(expression) (void)0 #endif // _DEBUG #endif // !DEBUG_BREAK_IF -namespace OCLRT { +namespace NEO { void debugBreak(int line, const char *file); [[noreturn]] void abortUnrecoverable(int line, const char *file); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/device_helpers.cpp b/runtime/helpers/device_helpers.cpp index aee6b9644f..d73ba03a74 100644 --- a/runtime/helpers/device_helpers.cpp +++ b/runtime/helpers/device_helpers.cpp @@ -10,10 +10,10 @@ #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { void DeviceHelper::getExtraDeviceInfo(cl_device_info paramName, cl_uint ¶m, const void *&src, size_t &size, size_t &retSize) {} uint32_t DeviceHelper::getDevicesCount(const HardwareInfo *pHwInfo) { return DebugManager.flags.CreateMultipleDevices.get() > 0 ? DebugManager.flags.CreateMultipleDevices.get() : 1u; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/device_helpers.h b/runtime/helpers/device_helpers.h index 52cd46dd71..3bbeb9fbd6 100644 --- a/runtime/helpers/device_helpers.h +++ b/runtime/helpers/device_helpers.h @@ -9,11 +9,11 @@ #include "CL/cl.h" #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; namespace DeviceHelper { void getExtraDeviceInfo(cl_device_info paramName, cl_uint ¶m, const void *&src, size_t &size, size_t &retSize); uint32_t getDevicesCount(const HardwareInfo *pHwInfo); }; // namespace DeviceHelper -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/dirty_state_helpers.cpp b/runtime/helpers/dirty_state_helpers.cpp index c4f564ba76..bfb98291d7 100644 --- a/runtime/helpers/dirty_state_helpers.cpp +++ b/runtime/helpers/dirty_state_helpers.cpp @@ -9,7 +9,7 @@ #include "runtime/indirect_heap/indirect_heap.h" -using namespace OCLRT; +using namespace NEO; bool HeapDirtyState::updateAndCheck(const IndirectHeap *heap) { if (!heap->getGraphicsAllocation()) { diff --git a/runtime/helpers/dirty_state_helpers.h b/runtime/helpers/dirty_state_helpers.h index 51e0aab2da..c97ea156b5 100644 --- a/runtime/helpers/dirty_state_helpers.h +++ b/runtime/helpers/dirty_state_helpers.h @@ -9,7 +9,7 @@ #include #include -namespace OCLRT { +namespace NEO { class IndirectHeap; class HeapDirtyState { @@ -20,4 +20,4 @@ class HeapDirtyState { uint64_t gpuBaseAddress = 0llu; size_t sizeInPages = 0u; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/dispatch_info.cpp b/runtime/helpers/dispatch_info.cpp index 169d02ebaf..5271d888df 100644 --- a/runtime/helpers/dispatch_info.cpp +++ b/runtime/helpers/dispatch_info.cpp @@ -9,7 +9,7 @@ #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { bool DispatchInfo::usesSlm() const { return (kernel == nullptr) ? false : kernel->slmTotalSize > 0; } @@ -32,4 +32,4 @@ Kernel *MultiDispatchInfo::peekMainKernel() const { Kernel *MultiDispatchInfo::peekParentKernel() const { return (mainKernel && mainKernel->isParentKernel) ? mainKernel : nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/dispatch_info.h b/runtime/helpers/dispatch_info.h index 84fa57b3c9..ba369b6d29 100644 --- a/runtime/helpers/dispatch_info.h +++ b/runtime/helpers/dispatch_info.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Kernel; @@ -169,4 +169,4 @@ struct MultiDispatchInfo { StackVec redescribedSurfaces; Kernel *mainKernel = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/dispatch_info_builder.h b/runtime/helpers/dispatch_info_builder.h index e60022992a..33cecc4cb4 100644 --- a/runtime/helpers/dispatch_info_builder.h +++ b/runtime/helpers/dispatch_info_builder.h @@ -11,7 +11,7 @@ #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { namespace SplitDispatch { enum class Dim : uint32_t { @@ -438,4 +438,4 @@ class DispatchInfoBuilder { return x % y ? 1 : 0; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/enable_product.inl b/runtime/helpers/enable_product.inl index f9ea2968b0..e2b164f437 100644 --- a/runtime/helpers/enable_product.inl +++ b/runtime/helpers/enable_product.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "hw_info.h" -namespace OCLRT { +namespace NEO { template struct EnableGfxProductHw { typedef typename HwMapper::GfxProduct GfxProduct; @@ -21,4 +21,4 @@ struct EnableGfxProductHw { hardwareInfoSetup[gfxProduct] = GfxProduct::setupHardwareInfo; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/engine_control.h b/runtime/helpers/engine_control.h index 8e2d04cefb..4c1b0db421 100644 --- a/runtime/helpers/engine_control.h +++ b/runtime/helpers/engine_control.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class OsContext; @@ -19,4 +19,4 @@ struct EngineControl { CommandStreamReceiver *commandStreamReceiver = nullptr; OsContext *osContext = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/flat_batch_buffer_helper.cpp b/runtime/helpers/flat_batch_buffer_helper.cpp index 8e955b68b0..e611fcaca4 100644 --- a/runtime/helpers/flat_batch_buffer_helper.cpp +++ b/runtime/helpers/flat_batch_buffer_helper.cpp @@ -10,7 +10,7 @@ #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { bool FlatBatchBufferHelper::setPatchInfoData(const PatchInfoData &data) { patchInfoCollection.push_back(data); @@ -67,4 +67,4 @@ void FlatBatchBufferHelper::fixCrossThreadDataInfo(std::vector &d MemoryManager *FlatBatchBufferHelper::getMemoryManager() const { return executionEnvironemnt.memoryManager.get(); } -}; // namespace OCLRT \ No newline at end of file +}; // namespace NEO \ No newline at end of file diff --git a/runtime/helpers/flat_batch_buffer_helper.h b/runtime/helpers/flat_batch_buffer_helper.h index ef4e0e0c50..10256a9247 100644 --- a/runtime/helpers/flat_batch_buffer_helper.h +++ b/runtime/helpers/flat_batch_buffer_helper.h @@ -13,7 +13,7 @@ #include #include -namespace OCLRT { +namespace NEO { enum class DispatchMode; class MemoryManager; @@ -47,4 +47,4 @@ class FlatBatchBufferHelper { std::map batchBufferStartAddressSequence; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/helpers/flat_batch_buffer_helper_hw.h b/runtime/helpers/flat_batch_buffer_helper_hw.h index 99d7cb3918..f1b2e7d7b7 100644 --- a/runtime/helpers/flat_batch_buffer_helper_hw.h +++ b/runtime/helpers/flat_batch_buffer_helper_hw.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/helpers/flat_batch_buffer_helper.h" -namespace OCLRT { +namespace NEO { template class FlatBatchBufferHelperHw : public FlatBatchBufferHelper { @@ -20,4 +20,4 @@ class FlatBatchBufferHelperHw : public FlatBatchBufferHelper { void removePipeControlData(size_t pipeControlLocationSize, void *pipeControlForNooping) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/flat_batch_buffer_helper_hw.inl b/runtime/helpers/flat_batch_buffer_helper_hw.inl index 6433ed5e81..035bd129c8 100644 --- a/runtime/helpers/flat_batch_buffer_helper_hw.inl +++ b/runtime/helpers/flat_batch_buffer_helper_hw.inl @@ -11,7 +11,7 @@ #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { template GraphicsAllocation *FlatBatchBufferHelperHw::flattenBatchBuffer(BatchBuffer &batchBuffer, size_t &sizeBatchBuffer, @@ -190,4 +190,4 @@ void FlatBatchBufferHelperHw::removePipeControlData(size_t pipeContro } } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/helpers/flush_stamp.cpp b/runtime/helpers/flush_stamp.cpp index 878377868a..ce853c87ac 100644 --- a/runtime/helpers/flush_stamp.cpp +++ b/runtime/helpers/flush_stamp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/helpers/flush_stamp.h" -using namespace OCLRT; +using namespace NEO; FlushStampTracker::FlushStampTracker(bool allocateStamp) { if (allocateStamp) { diff --git a/runtime/helpers/flush_stamp.h b/runtime/helpers/flush_stamp.h index 128845a830..de810748d7 100644 --- a/runtime/helpers/flush_stamp.h +++ b/runtime/helpers/flush_stamp.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/utilities/reference_tracked_object.h" #include "runtime/utilities/stackvec.h" -namespace OCLRT { +namespace NEO { struct FlushStampTrackingObj : public ReferenceTrackedObject { FlushStamp flushStamp = 0; std::atomic initialized{false}; @@ -45,4 +45,4 @@ class FlushStampUpdateHelper { private: StackVec flushStampsToUpdate; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/gmm_callbacks.h b/runtime/helpers/gmm_callbacks.h index 7646697828..9d82701806 100644 --- a/runtime/helpers/gmm_callbacks.h +++ b/runtime/helpers/gmm_callbacks.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { template struct DeviceCallbacks { @@ -22,4 +22,4 @@ struct TTCallbacks { static int __stdcall writeL3Address(void *queueHandle, uint64_t l3GfxAddress, uint64_t regOffset); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/gmm_callbacks.inl b/runtime/helpers/gmm_callbacks.inl index dde4c140a6..ca97a9850a 100644 --- a/runtime/helpers/gmm_callbacks.inl +++ b/runtime/helpers/gmm_callbacks.inl @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { template long __stdcall DeviceCallbacks::notifyAubCapture(void *csrHandle, uint64_t gfxAddress, size_t gfxSize, bool allocate) { @@ -23,4 +23,4 @@ int __stdcall TTCallbacks::writeL3Address(void *queueHandle, uint64_t return 0; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hardware_context_controller.cpp b/runtime/helpers/hardware_context_controller.cpp index d059dcec5c..727c573a24 100644 --- a/runtime/helpers/hardware_context_controller.cpp +++ b/runtime/helpers/hardware_context_controller.cpp @@ -10,7 +10,7 @@ #include "runtime/memory_manager/memory_constants.h" #include "runtime/os_interface/os_context.h" -using namespace OCLRT; +using namespace NEO; HardwareContextController::HardwareContextController(aub_stream::AubManager &aubManager, OsContext &osContext, uint32_t flags) { auto deviceBitfield = osContext.getDeviceBitfield(); diff --git a/runtime/helpers/hardware_context_controller.h b/runtime/helpers/hardware_context_controller.h index dded370ca0..fcd21f899e 100644 --- a/runtime/helpers/hardware_context_controller.h +++ b/runtime/helpers/hardware_context_controller.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class OsContext; class HardwareContextController { @@ -31,4 +31,4 @@ class HardwareContextController { std::vector> hardwareContexts; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hash.h b/runtime/helpers/hash.h index 209019e13b..6517acfb5e 100644 --- a/runtime/helpers/hash.h +++ b/runtime/helpers/hash.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { // clang-format off #define HASH_JENKINS_MIX(a,b,c) \ { \ @@ -114,4 +114,4 @@ uint32_t hashPtrToU32(const T *src) { return static_cast(asInt); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hw_helper.cpp b/runtime/helpers/hw_helper.cpp index 56f1101f8b..86e739ff3f 100644 --- a/runtime/helpers/hw_helper.cpp +++ b/runtime/helpers/hw_helper.cpp @@ -9,7 +9,7 @@ #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { HwHelper *hwHelperFactory[IGFX_MAX_CORE] = {}; HwHelper &HwHelper::get(GFXCORE_FAMILY gfxCore) { @@ -40,4 +40,4 @@ bool HwHelper::cacheFlushAfterWalkerSupported(const HardwareInfo &hwInfo) { return hwInfo.capabilityTable.supportCacheFlushAfterWalker; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hw_helper.h b/runtime/helpers/hw_helper.h index f0800299a9..471c0f2ba4 100644 --- a/runtime/helpers/hw_helper.h +++ b/runtime/helpers/hw_helper.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { class ExecutionEnvironment; class GraphicsAllocation; struct HardwareCapabilities; @@ -200,4 +200,4 @@ union SURFACE_STATE_BUFFER_LENGTH { } SurfaceState; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hw_helper_common.inl b/runtime/helpers/hw_helper_common.inl index aa0b8f1f14..972b938e4a 100644 --- a/runtime/helpers/hw_helper_common.inl +++ b/runtime/helpers/hw_helper_common.inl @@ -16,7 +16,7 @@ #include "runtime/memory_manager/memory_constants.h" #include "runtime/os_interface/os_interface.h" -namespace OCLRT { +namespace NEO { template void HwHelperHw::setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag) { @@ -209,4 +209,4 @@ typename Family::PIPE_CONTROL *PipeControlHelper::obtainPipeControlAndPr return pipeControl; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hw_info.cpp b/runtime/helpers/hw_info.cpp index d8f16a99d7..b197edda68 100644 --- a/runtime/helpers/hw_info.cpp +++ b/runtime/helpers/hw_info.cpp @@ -11,7 +11,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { HardwareInfo::HardwareInfo(const PLATFORM *platform, const FeatureTable *skuTable, const WorkaroundTable *waTable, const GT_SYSTEM_INFO *sysInfo, const RuntimeCapabilityTable &capabilityTable) : pPlatform(platform), pSkuTable(skuTable), pWaTable(waTable), pSysInfo(sysInfo), capabilityTable(capabilityTable) { @@ -51,4 +51,4 @@ EngineType getChosenEngineType(const HardwareInfo &hwInfo) { ? hwInfo.capabilityTable.defaultEngineType : static_cast(DebugManager.flags.NodeOrdinal.get()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/hw_info.h b/runtime/helpers/hw_info.h index 505e6f98bb..0e7b8b8c66 100644 --- a/runtime/helpers/hw_info.h +++ b/runtime/helpers/hw_info.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct WhitelistedRegisters { bool csChicken1_0x2580; @@ -102,4 +102,4 @@ struct EnableGfxFamilyHw { const char *getPlatformType(const HardwareInfo &hwInfo); bool getHwInfoForPlatformString(const char *str, const HardwareInfo *&hwInfoIn); EngineType getChosenEngineType(const HardwareInfo &hwInfo); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/kernel_commands.h b/runtime/helpers/kernel_commands.h index 84d289a022..e505870bf7 100644 --- a/runtime/helpers/kernel_commands.h +++ b/runtime/helpers/kernel_commands.h @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { class LinearStream; class IndirectHeap; @@ -213,4 +213,4 @@ struct KernelCommandsHelper : public PerThreadDataHelper { static bool inlineDataProgrammingRequired(const Kernel &kernel); static bool kernelUsesLocalIds(const Kernel &kernel); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/kernel_commands.inl b/runtime/helpers/kernel_commands.inl index 4ba259bd98..d9be2d057c 100644 --- a/runtime/helpers/kernel_commands.inl +++ b/runtime/helpers/kernel_commands.inl @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { template bool KernelCommandsHelper::isPipeControlWArequired() { return false; } @@ -420,4 +420,4 @@ bool KernelCommandsHelper::kernelUsesLocalIds(const Kernel &kernel) { kernel.getKernelInfo().patchInfo.threadPayload->LocalIDZPresent); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/kernel_commands_base.inl b/runtime/helpers/kernel_commands_base.inl index a3b1088cc9..c4c651c0ff 100644 --- a/runtime/helpers/kernel_commands_base.inl +++ b/runtime/helpers/kernel_commands_base.inl @@ -9,7 +9,7 @@ #include "runtime/helpers/kernel_commands.h" #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { template typename KernelCommandsHelper::INTERFACE_DESCRIPTOR_DATA *KernelCommandsHelper::getInterfaceDescriptor( @@ -170,4 +170,4 @@ void KernelCommandsHelper::programCacheFlushAfterWalkerCommand(Linear pipeControl->setCommandStreamerStallEnable(true); pipeControl->setDcFlushEnable(true); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/kernel_helpers.cpp b/runtime/helpers/kernel_helpers.cpp index 65345edffb..9b48fc6413 100644 --- a/runtime/helpers/kernel_helpers.cpp +++ b/runtime/helpers/kernel_helpers.cpp @@ -7,10 +7,10 @@ #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { bool Kernel::requiresCacheFlushCommand(const CommandQueue &commandQueue) const { return false; } void Kernel::reconfigureKernel() { } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/helpers/kmd_notify_properties.cpp b/runtime/helpers/kmd_notify_properties.cpp index bfcd9931c5..b8167eeb50 100644 --- a/runtime/helpers/kmd_notify_properties.cpp +++ b/runtime/helpers/kmd_notify_properties.cpp @@ -11,7 +11,7 @@ #include -using namespace OCLRT; +using namespace NEO; bool KmdNotifyHelper::obtainTimeoutParams(int64_t &timeoutValueOutput, bool quickKmdSleepRequest, diff --git a/runtime/helpers/kmd_notify_properties.h b/runtime/helpers/kmd_notify_properties.h index 7a34cc9fd7..55816d33cc 100644 --- a/runtime/helpers/kmd_notify_properties.h +++ b/runtime/helpers/kmd_notify_properties.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct KmdNotifyProperties { int64_t delayKmdNotifyMicroseconds; int64_t delayQuickKmdSleepMicroseconds; @@ -64,4 +64,4 @@ class KmdNotifyHelper { std::atomic acLineConnected{true}; bool maxPowerSavingMode = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/linux/kmd_notify_properties_linux.cpp b/runtime/helpers/linux/kmd_notify_properties_linux.cpp index 4f2d6b813c..6efe063ed2 100644 --- a/runtime/helpers/linux/kmd_notify_properties_linux.cpp +++ b/runtime/helpers/linux/kmd_notify_properties_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/helpers/kmd_notify_properties.h" -using namespace OCLRT; +using namespace NEO; void KmdNotifyHelper::updateAcLineStatus() {} diff --git a/runtime/helpers/mipmap.cpp b/runtime/helpers/mipmap.cpp index d1860f1bf7..3c96437604 100644 --- a/runtime/helpers/mipmap.cpp +++ b/runtime/helpers/mipmap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { uint32_t getMipLevelOriginIdx(cl_mem_object_type imageType) { switch (imageType) { @@ -95,4 +95,4 @@ uint32_t getMipOffset(Image *image, const size_t *origin) { } return static_cast(bytesPerPixel * offset); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/mipmap.h b/runtime/helpers/mipmap.h index 8fffcc2b2e..5153e278f2 100644 --- a/runtime/helpers/mipmap.h +++ b/runtime/helpers/mipmap.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class MemObj; class Image; @@ -27,4 +27,4 @@ bool isMipMapped(const MemObj *memObj); uint32_t getMipOffset(Image *image, const size_t *origin); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/options.cpp b/runtime/helpers/options.cpp index 272b6bfe68..74d719d08e 100644 --- a/runtime/helpers/options.cpp +++ b/runtime/helpers/options.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { // AUB file folder location const char *folderAUB = "."; @@ -26,4 +26,4 @@ static const HardwareInfo *DefaultPlatformDevices[] = { size_t numPlatformDevices = arrayCount(DefaultPlatformDevices); const HardwareInfo **platformDevices = DefaultPlatformDevices; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/options.h b/runtime/helpers/options.h index 121bc55778..138ce2b6d3 100644 --- a/runtime/helpers/options.h +++ b/runtime/helpers/options.h @@ -30,7 +30,7 @@ enum CommandStreamReceiverType { CSR_TYPES_NUM }; -namespace OCLRT { +namespace NEO { struct HardwareInfo; // AUB file folder location @@ -43,4 +43,4 @@ extern uint32_t initialHardwareTag; // Number of devices in the platform extern size_t numPlatformDevices; extern const HardwareInfo **platformDevices; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/per_thread_data.cpp b/runtime/helpers/per_thread_data.cpp index 07aa304a3a..be74dc7af0 100644 --- a/runtime/helpers/per_thread_data.cpp +++ b/runtime/helpers/per_thread_data.cpp @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { size_t PerThreadDataHelper::sendPerThreadData( LinearStream &indirectHeap, @@ -48,4 +48,4 @@ uint32_t PerThreadDataHelper::getThreadPayloadSize(const iOpenCL::SPatchThreadPa threadPayloadSize += (threadPayload.UnusedPerThreadConstantPresent) ? (sizeof(GRF)) : 0; return threadPayloadSize; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/per_thread_data.h b/runtime/helpers/per_thread_data.h index 4c2943a731..9e501b394c 100644 --- a/runtime/helpers/per_thread_data.h +++ b/runtime/helpers/per_thread_data.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { class LinearStream; struct PerThreadDataHelper { @@ -47,4 +47,4 @@ struct PerThreadDataHelper { static uint32_t getThreadPayloadSize(const iOpenCL::SPatchThreadPayload &threadPayload, uint32_t simd); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/pipeline_select_helper.h b/runtime/helpers/pipeline_select_helper.h index e652cc3eb0..ea3d19178c 100644 --- a/runtime/helpers/pipeline_select_helper.h +++ b/runtime/helpers/pipeline_select_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { const uint32_t pipelineSelectEnablePipelineSelectMaskBits = 0x3; const uint32_t pipelineSelectMediaSamplerDopClockGateMaskBits = 0x10; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/preamble.h b/runtime/helpers/preamble.h index 68645b7d57..972fc5b377 100644 --- a/runtime/helpers/preamble.h +++ b/runtime/helpers/preamble.h @@ -13,7 +13,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class Device; @@ -77,4 +77,4 @@ static constexpr uint32_t registerOffset = 0xe400; static constexpr uint32_t debugEnabledValue = (1 << 4) | (1 << 7); }; // namespace TdDebugControlRegisterOffset -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/preamble.inl b/runtime/helpers/preamble.inl index 8cd1a3d38b..4502e5228c 100644 --- a/runtime/helpers/preamble.inl +++ b/runtime/helpers/preamble.inl @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { template void PreambleHelper::programThreadArbitration(LinearStream *pCommandStream, uint32_t requiredThreadArbitrationPolicy) { @@ -121,4 +121,4 @@ uint32_t PreambleHelper::getMaxThreadsForVfe(const HardwareInfo &hwIn return hwInfo.pSysInfo->EUCount * threadsPerEU; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/properties_helper.cpp b/runtime/helpers/properties_helper.cpp index 914ae74377..35a2fbcd9a 100644 --- a/runtime/helpers/properties_helper.cpp +++ b/runtime/helpers/properties_helper.cpp @@ -12,7 +12,7 @@ #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { TransferProperties::TransferProperties(MemObj *memObj, cl_command_type cmdType, cl_map_flags mapFlags, bool blocking, size_t *offsetPtr, size_t *sizePtr, void *ptr) : memObj(memObj), cmdType(cmdType), mapFlags(mapFlags), blocking(blocking), ptr(ptr) { @@ -45,4 +45,4 @@ void *TransferProperties::getCpuPtrForReadWrite() { return ptrOffset(lockedPtr ? ptrOffset(lockedPtr, memObj->getOffset()) : memObj->getCpuAddressForMemoryTransfer(), offset[0]); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/properties_helper.h b/runtime/helpers/properties_helper.h index a662915419..1aa4e26e45 100644 --- a/runtime/helpers/properties_helper.h +++ b/runtime/helpers/properties_helper.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class MemObj; class Buffer; @@ -86,4 +86,4 @@ class NonCopyableOrMovableClass { NonCopyableOrMovableClass(NonCopyableOrMovableClass &&) = delete; NonCopyableOrMovableClass &operator=(NonCopyableOrMovableClass &&) = delete; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/queue_helpers.cpp b/runtime/helpers/queue_helpers.cpp index d72843a541..3e64a1687d 100644 --- a/runtime/helpers/queue_helpers.cpp +++ b/runtime/helpers/queue_helpers.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/queue_helpers.h" -namespace OCLRT { +namespace NEO { bool isExtraToken(const cl_queue_properties *property) { return false; } @@ -22,4 +22,4 @@ void CommandQueue::processProperties(const cl_queue_properties *properties) { void getIntelQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, GetInfoHelper &getInfoHelper, cl_int &retVal) { retVal = CL_INVALID_VALUE; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/queue_helpers.h b/runtime/helpers/queue_helpers.h index 529282d14b..f70071e02a 100644 --- a/runtime/helpers/queue_helpers.h +++ b/runtime/helpers/queue_helpers.h @@ -10,7 +10,7 @@ #include "runtime/device_queue/device_queue.h" #include "runtime/helpers/get_info.h" -namespace OCLRT { +namespace NEO { inline void releaseVirtualEvent(CommandQueue &commandQueue) { if (commandQueue.getRefApiCount() == 1) { @@ -122,4 +122,4 @@ returnType getCmdQueueProperties(const cl_queue_properties *properties, } bool isExtraToken(const cl_queue_properties *property); bool verifyExtraTokens(Device *&device, Context &context, const cl_queue_properties *properties); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/state_base_address.h b/runtime/helpers/state_base_address.h index 1a0792d641..f81a22aa3d 100644 --- a/runtime/helpers/state_base_address.h +++ b/runtime/helpers/state_base_address.h @@ -9,7 +9,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GmmHelper; class IndirectHeap; @@ -44,4 +44,4 @@ struct StateBaseAddressHelper { static void programBindingTableBaseAddress(LinearStream &commandStream, const IndirectHeap &ssh, size_t stateBaseAddressCmdOffset, GmmHelper *gmmHelper); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/state_base_address.inl b/runtime/helpers/state_base_address.inl index a3493215a0..96ea886706 100644 --- a/runtime/helpers/state_base_address.inl +++ b/runtime/helpers/state_base_address.inl @@ -13,7 +13,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template void StateBaseAddressHelper::programStateBaseAddress( LinearStream &commandStream, @@ -82,4 +82,4 @@ void StateBaseAddressHelper::programBindingTableBaseAddress(LinearStr UNRECOVERABLE_IF(sbaCommand->getSurfaceStateBaseAddress() != ssh.getGraphicsAllocation()->getGpuAddress()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/surface_formats.cpp b/runtime/helpers/surface_formats.cpp index b450cf874d..d2f0d1a706 100644 --- a/runtime/helpers/surface_formats.cpp +++ b/runtime/helpers/surface_formats.cpp @@ -14,7 +14,7 @@ #include "validators.h" -namespace OCLRT { +namespace NEO { // clang-format off @@ -246,7 +246,7 @@ ArrayRef SurfaceFormats::surfaceFormats(cl_mem_flags fl } ArrayRef SurfaceFormats::surfaceFormats(cl_mem_flags flags, const cl_image_format *imageFormat) noexcept { - if (OCLRT::IsNV12Image(imageFormat)) { + if (NEO::IsNV12Image(imageFormat)) { return planarYuv(); } else if (IsPackedYuvImage(imageFormat)) { @@ -272,4 +272,4 @@ ArrayRef SurfaceFormats::surfaceFormats(cl_mem_flags fl } // clang-format on -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/surface_formats.h b/runtime/helpers/surface_formats.h index 4a7b878865..f303aad88f 100644 --- a/runtime/helpers/surface_formats.h +++ b/runtime/helpers/surface_formats.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ #include "runtime/gmm_helper/gmm_lib.h" #include "runtime/utilities/arrayref.h" -namespace OCLRT { +namespace NEO { enum GFX3DSTATE_SURFACEFORMAT : unsigned short { GFX3DSTATE_SURFACEFORMAT_R32G32B32A32_FLOAT = 0x000, GFX3DSTATE_SURFACEFORMAT_R32G32B32A32_SINT = 0x001, @@ -254,4 +254,4 @@ class SurfaceFormats { static ArrayRef surfaceFormats(cl_mem_flags flags, const cl_image_format *imageFormat) noexcept; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index 26479e9353..887a3a046f 100644 --- a/runtime/helpers/task_information.cpp +++ b/runtime/helpers/task_information.cpp @@ -22,7 +22,7 @@ #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/surface.h" -namespace OCLRT { +namespace NEO { KernelOperation::~KernelOperation() { storageForAllocations.storeAllocation(std::unique_ptr(dsh->getGraphicsAllocation()), REUSABLE_ALLOCATION); if (ioh.get() == dsh.get()) { @@ -289,4 +289,4 @@ CompletionStamp &CommandMarker::submit(uint32_t taskLevel, bool terminated) { return completionStamp; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/task_information.h b/runtime/helpers/task_information.h index 910238b126..ffc94bb78d 100644 --- a/runtime/helpers/task_information.h +++ b/runtime/helpers/task_information.h @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CommandQueue; class CommandStreamReceiver; class InternalAllocationStorage; @@ -131,4 +131,4 @@ class CommandMarker : public Command { uint32_t clCommandType; uint32_t commandSize; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/timestamp_packet.cpp b/runtime/helpers/timestamp_packet.cpp index 29fa2d3609..973dff8e4b 100644 --- a/runtime/helpers/timestamp_packet.cpp +++ b/runtime/helpers/timestamp_packet.cpp @@ -13,7 +13,7 @@ #include "runtime/helpers/kernel_commands.h" #include "runtime/utilities/tag_allocator.h" -using namespace OCLRT; +using namespace NEO; void TimestampPacketContainer::add(Node *timestampPacketNode) { timestampPacketNodes.push_back(timestampPacketNode); diff --git a/runtime/helpers/timestamp_packet.h b/runtime/helpers/timestamp_packet.h index 365dda8c1f..1ebc4cb081 100644 --- a/runtime/helpers/timestamp_packet.h +++ b/runtime/helpers/timestamp_packet.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class LinearStream; @@ -141,4 +141,4 @@ struct TimestampPacketHelper { return totalNodesCount * (sizeof(typename GfxFamily::MI_SEMAPHORE_WAIT) + sizeof(typename GfxFamily::MI_ATOMIC)); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/uint16_avx2.h b/runtime/helpers/uint16_avx2.h index aecfa7946c..8c91b94b58 100644 --- a/runtime/helpers/uint16_avx2.h +++ b/runtime/helpers/uint16_avx2.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { #if __AVX2__ struct uint16x16_t { @@ -109,4 +109,4 @@ struct uint16x16_t { } }; #endif // __AVX2__ -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/uint16_sse4.h b/runtime/helpers/uint16_sse4.h index 16e8ceb0fa..8d7f020bfc 100644 --- a/runtime/helpers/uint16_sse4.h +++ b/runtime/helpers/uint16_sse4.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct uint16x8_t { enum { numChannels = 8 }; @@ -107,4 +107,4 @@ struct uint16x8_t { return result; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/validators.cpp b/runtime/helpers/validators.cpp index ce2a232d73..2938526639 100644 --- a/runtime/helpers/validators.cpp +++ b/runtime/helpers/validators.cpp @@ -18,7 +18,7 @@ #include "runtime/program/program.h" #include "runtime/sampler/sampler.h" -namespace OCLRT { +namespace NEO { cl_int validateObject(void *ptr) { return ptr != nullptr @@ -155,4 +155,4 @@ bool IsPackedYuvImage(const cl_image_format *imageFormat) { bool IsNV12Image(const cl_image_format *imageFormat) { return imageFormat->image_channel_order == CL_NV12_INTEL; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/validators.h b/runtime/helpers/validators.h index 12209a91cd..84ce15a496 100644 --- a/runtime/helpers/validators.h +++ b/runtime/helpers/validators.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { // Provide some aggregators... typedef std::pair EventWaitList; @@ -25,7 +25,7 @@ enum PatternSize : size_t; template CLType WithCastToInternal(CLType clObject, InternalType **internalObject) { - *internalObject = OCLRT::castToObject(clObject); + *internalObject = NEO::castToObject(clObject); return (*internalObject) ? clObject : nullptr; } @@ -86,4 +86,4 @@ bool areNotNullptr(T t, RT... rt) { cl_int validateYuvOperation(const size_t *origin, const size_t *region); bool IsPackedYuvImage(const cl_image_format *imageFormat); bool IsNV12Image(const cl_image_format *imageFormat); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/helpers/windows/gl_helper.h b/runtime/helpers/windows/gl_helper.h index 6098269cd6..eabcd150ee 100644 --- a/runtime/helpers/windows/gl_helper.h +++ b/runtime/helpers/windows/gl_helper.h @@ -13,7 +13,7 @@ namespace Os { extern const char *openglDllName; } -namespace OCLRT { +namespace NEO { class glFunctionHelper { public: glFunctionHelper::glFunctionHelper(OsLibrary *glLibrary, const std::string &functionName) { @@ -29,4 +29,4 @@ class glFunctionHelper { PROC(__stdcall *glFunctionPtr)(LPCSTR Arg1) = nullptr; // clang-format on }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/helpers/windows/kmd_notify_properties_windows.cpp b/runtime/helpers/windows/kmd_notify_properties_windows.cpp index fd5315a709..802718c382 100644 --- a/runtime/helpers/windows/kmd_notify_properties_windows.cpp +++ b/runtime/helpers/windows/kmd_notify_properties_windows.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/helpers/kmd_notify_properties.h" #include "runtime/os_interface/windows/sys_calls.h" -using namespace OCLRT; +using namespace NEO; void KmdNotifyHelper::updateAcLineStatus() { SYSTEM_POWER_STATUS systemPowerStatus = {}; diff --git a/runtime/indirect_heap/indirect_heap.cpp b/runtime/indirect_heap/indirect_heap.cpp index 58a9e7b727..d4e934f1a0 100644 --- a/runtime/indirect_heap/indirect_heap.cpp +++ b/runtime/indirect_heap/indirect_heap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "indirect_heap.h" -namespace OCLRT { +namespace NEO { IndirectHeap::IndirectHeap(GraphicsAllocation *gfxAllocation) : BaseClass(gfxAllocation) { } @@ -18,4 +18,4 @@ IndirectHeap::IndirectHeap(GraphicsAllocation *gfxAllocation, bool canBeUtilized IndirectHeap::IndirectHeap(void *buffer, size_t bufferSize) : BaseClass(buffer, bufferSize) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/indirect_heap/indirect_heap.h b/runtime/indirect_heap/indirect_heap.h index 0426ef29ac..311b175c28 100644 --- a/runtime/indirect_heap/indirect_heap.h +++ b/runtime/indirect_heap/indirect_heap.h @@ -13,7 +13,7 @@ #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_constants.h" -namespace OCLRT { +namespace NEO { class GraphicsAllocation; constexpr size_t defaultHeapSize = 64 * KB; @@ -75,4 +75,4 @@ inline uint64_t IndirectHeap::getHeapGpuBase() const { return this->graphicsAllocation->getGpuAddress(); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/instrumentation/instrumentation.cpp b/runtime/instrumentation/instrumentation.cpp index 5f889788bd..ed824ef6e2 100644 --- a/runtime/instrumentation/instrumentation.cpp +++ b/runtime/instrumentation/instrumentation.cpp @@ -1,28 +1,13 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "instrumentation.h" -namespace OCLRT { +namespace NEO { const bool haveInstrumentation = false; bool instrAutoSamplingStart( @@ -106,4 +91,4 @@ uint32_t instrSetPlatformInfo( return 0; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/instrumentation/instrumentation.h b/runtime/instrumentation/instrumentation.h index ad01a56515..f6b64e384e 100644 --- a/runtime/instrumentation/instrumentation.h +++ b/runtime/instrumentation/instrumentation.h @@ -1,30 +1,15 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include -namespace OCLRT { +namespace NEO { constexpr unsigned int INSTR_GENERAL_PURPOSE_COUNTERS_COUNT = 4; constexpr unsigned int INSTR_MAX_USER_COUNTERS_COUNT = 32; @@ -222,4 +207,4 @@ uint32_t instrSetPlatformInfo( uint32_t productId, void *pSkuTable); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/get_additional_kernel_info.cpp b/runtime/kernel/get_additional_kernel_info.cpp index 1aacccb12d..f31c762c64 100644 --- a/runtime/kernel/get_additional_kernel_info.cpp +++ b/runtime/kernel/get_additional_kernel_info.cpp @@ -7,7 +7,7 @@ #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { void Kernel::getAdditionalInfo(cl_kernel_info paramName, const void *¶mValue, size_t ¶mValueSizeRet) const { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/image_transformer.cpp b/runtime/kernel/image_transformer.cpp index a2589d6090..ef43e59ca2 100644 --- a/runtime/kernel/image_transformer.cpp +++ b/runtime/kernel/image_transformer.cpp @@ -11,7 +11,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/program/kernel_info.h" -namespace OCLRT { +namespace NEO { void ImageTransformer::registerImage3d(uint32_t argIndex) { if (std::find(argIndexes.begin(), argIndexes.end(), argIndex) == argIndexes.end()) { argIndexes.push_back(argIndex); @@ -43,4 +43,4 @@ bool ImageTransformer::didTransform() const { bool ImageTransformer::hasRegisteredImages3d() const { return !argIndexes.empty(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/image_transformer.h b/runtime/kernel/image_transformer.h index 6640897f60..f656e112b3 100644 --- a/runtime/kernel/image_transformer.h +++ b/runtime/kernel/image_transformer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { class ImageTransformer { public: @@ -22,4 +22,4 @@ class ImageTransformer { bool transformed = false; std::vector argIndexes; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index 0d21b62aa2..5aa27ba0a5 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -47,7 +47,7 @@ using namespace iOpenCL; -namespace OCLRT { +namespace NEO { class Surface; uint32_t Kernel::dummyPatchLocation = 0xbaddf00d; @@ -2195,4 +2195,4 @@ void Kernel::addAllocationToCacheFlushVector(uint32_t argIndex, GraphicsAllocati } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/kernel.h b/runtime/kernel/kernel.h index 60913509ad..da51f6314a 100644 --- a/runtime/kernel/kernel.h +++ b/runtime/kernel/kernel.h @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { struct CompletionStamp; class Buffer; class GraphicsAllocation; @@ -516,4 +516,4 @@ class Kernel : public BaseObject<_cl_kernel> { bool svmAllocationsRequireCacheFlush = false; std::vector kernelArgRequiresCacheFlush; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/kernel/kernel.inl b/runtime/kernel/kernel.inl index 3104b82300..d5217a84f8 100644 --- a/runtime/kernel/kernel.inl +++ b/runtime/kernel/kernel.inl @@ -8,7 +8,7 @@ #include "runtime/kernel/kernel.h" #include "runtime/program/printf_handler.h" -namespace OCLRT { +namespace NEO { template void Kernel::patchReflectionSurface(DeviceQueue *devQueue, PrintfHandler *printfHandler) { @@ -83,4 +83,4 @@ void Kernel::patchReflectionSurface(DeviceQueue *devQueue, PrintfHandler *printf ReflectionSurfaceHelper::setParentImageParams(reflectionSurface, this->kernelArguments, this->kernelInfo); ReflectionSurfaceHelper::setParentSamplerParams(reflectionSurface, this->kernelArguments, this->kernelInfo); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index dff9062cab..09d62402b7 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -24,7 +24,7 @@ #include "runtime/memory_manager/svm_memory_manager.h" #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { BufferFuncs bufferFactory[IGFX_MAX_CORE] = {}; @@ -507,4 +507,4 @@ void Buffer::setSurfaceState(const Device *device, buffer->graphicsAllocation = nullptr; delete buffer; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/buffer.h b/runtime/mem_obj/buffer.h index 6127d3b321..ba6e8e9467 100644 --- a/runtime/mem_obj/buffer.h +++ b/runtime/mem_obj/buffer.h @@ -14,7 +14,7 @@ #include "igfxfmid.h" -namespace OCLRT { +namespace NEO { class Buffer; class Device; class MemoryManager; @@ -191,4 +191,4 @@ class BufferHw : public Buffer { typedef typename GfxFamily::RENDER_SURFACE_STATE SURFACE_STATE; typename SURFACE_STATE::SURFACE_TYPE surfaceType; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/buffer.inl b/runtime/mem_obj/buffer.inl index 9a67b65300..22fa360a24 100644 --- a/runtime/mem_obj/buffer.inl +++ b/runtime/mem_obj/buffer.inl @@ -16,7 +16,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { union SURFACE_STATE_BUFFER_LENGTH { uint32_t Length; @@ -94,4 +94,4 @@ void BufferHw::setArgStateful(void *memory, bool forceNonAuxMode, boo template void BufferHw::appendBufferState(void *memory, Context *context, GraphicsAllocation *gfxAllocation) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/definitions/mem_obj_types.h b/runtime/mem_obj/definitions/mem_obj_types.h index be07cc38b6..a3482cc936 100644 --- a/runtime/mem_obj/definitions/mem_obj_types.h +++ b/runtime/mem_obj/definitions/mem_obj_types.h @@ -8,11 +8,11 @@ #pragma once #include "runtime/mem_obj/definitions/mem_obj_types_common.inl" -namespace OCLRT { +namespace NEO { struct MemoryProperties : MemoryPropertiesBase { MemoryProperties() : MemoryPropertiesBase(0) {} MemoryProperties(cl_mem_flags flags) : MemoryPropertiesBase(flags) {} }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/definitions/mem_obj_types_common.inl b/runtime/mem_obj/definitions/mem_obj_types_common.inl index e8d5422026..16972d90d0 100644 --- a/runtime/mem_obj/definitions/mem_obj_types_common.inl +++ b/runtime/mem_obj/definitions/mem_obj_types_common.inl @@ -7,7 +7,7 @@ #include "public/cl_ext_private.h" -namespace OCLRT { +namespace NEO { struct MemoryPropertiesBase { MemoryPropertiesBase(cl_mem_flags flags) : flags(flags) {} @@ -15,4 +15,4 @@ struct MemoryPropertiesBase { cl_mem_flags_intel flags_intel = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index a10e7bdead..6e6c7a5fd8 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -31,7 +31,7 @@ #include -namespace OCLRT { +namespace NEO { ImageFuncs imageFactory[IGFX_MAX_CORE] = {}; @@ -1301,4 +1301,4 @@ bool Image::hasValidParentImageFormat(const cl_image_format &imageFormat) const return false; } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/image.h b/runtime/mem_obj/image.h index 8767ad7a36..7f67ac42d2 100644 --- a/runtime/mem_obj/image.h +++ b/runtime/mem_obj/image.h @@ -11,7 +11,7 @@ #include "runtime/helpers/validators.h" #include "runtime/mem_obj/mem_obj.h" -namespace OCLRT { +namespace NEO { class Image; struct KernelInfo; struct SurfaceFormatInfo; @@ -345,4 +345,4 @@ class ImageHw : public Image { } typename RENDER_SURFACE_STATE::SURFACE_TYPE surfaceType; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl index f374ef5dc1..b8a7b8546f 100644 --- a/runtime/mem_obj/image.inl +++ b/runtime/mem_obj/image.inl @@ -15,7 +15,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { union SURFACE_STATE_BUFFER_LENGTH { uint32_t Length; @@ -261,4 +261,4 @@ void ImageHw::transformImage3dTo2dArray(void *memory) { surfaceState->setSurfaceType(SURFACE_TYPE::SURFACE_TYPE_SURFTYPE_2D); surfaceState->setSurfaceArray(true); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/image_base.inl b/runtime/mem_obj/image_base.inl index a31c61fa03..be76ff55f1 100644 --- a/runtime/mem_obj/image_base.inl +++ b/runtime/mem_obj/image_base.inl @@ -5,7 +5,7 @@ * */ -namespace OCLRT { +namespace NEO { template void ImageHw::setClearColorParams(RENDER_SURFACE_STATE *surfaceState, const Gmm *gmm) { @@ -14,4 +14,4 @@ void ImageHw::setClearColorParams(RENDER_SURFACE_STATE *surfaceState, template void ImageHw::setAuxParamsForMCSCCS(RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/map_operations_handler.cpp b/runtime/mem_obj/map_operations_handler.cpp index 3c1ae885f6..e57612fd87 100644 --- a/runtime/mem_obj/map_operations_handler.cpp +++ b/runtime/mem_obj/map_operations_handler.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/ptr_math.h" -using namespace OCLRT; +using namespace NEO; size_t MapOperationsHandler::size() const { std::lock_guard lock(mtx); diff --git a/runtime/mem_obj/map_operations_handler.h b/runtime/mem_obj/map_operations_handler.h index 7dd737cc35..97056859bf 100644 --- a/runtime/mem_obj/map_operations_handler.h +++ b/runtime/mem_obj/map_operations_handler.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { class MapOperationsHandler { public: @@ -28,4 +28,4 @@ class MapOperationsHandler { mutable std::mutex mtx; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/mem_obj.cpp b/runtime/mem_obj/mem_obj.cpp index 938a0de847..bb400b10d5 100644 --- a/runtime/mem_obj/mem_obj.cpp +++ b/runtime/mem_obj/mem_obj.cpp @@ -22,7 +22,7 @@ #include -namespace OCLRT { +namespace NEO { MemObj::MemObj(Context *context, cl_mem_object_type memObjectType, @@ -326,4 +326,4 @@ bool MemObj::mappingOnCpuAllowed() const { !(graphicsAllocation->getDefaultGmm() && graphicsAllocation->getDefaultGmm()->isRenderCompressed) && MemoryPool::isSystemMemoryPool(graphicsAllocation->getMemoryPool()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/mem_obj.h b/runtime/mem_obj/mem_obj.h index 65a0d81571..022c090bf1 100644 --- a/runtime/mem_obj/mem_obj.h +++ b/runtime/mem_obj/mem_obj.h @@ -19,7 +19,7 @@ #include #include -namespace OCLRT { +namespace NEO { class ExecutionEnvironment; class GraphicsAllocation; struct KernelInfo; @@ -149,4 +149,4 @@ class MemObj : public BaseObject<_cl_mem> { std::vector destructorCallbacks; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/mem_obj_helper.cpp b/runtime/mem_obj/mem_obj_helper.cpp index 8427a4d33f..b3f2d5532c 100644 --- a/runtime/mem_obj/mem_obj_helper.cpp +++ b/runtime/mem_obj/mem_obj_helper.cpp @@ -9,7 +9,7 @@ #include "common/helpers/bit_helpers.h" -namespace OCLRT { +namespace NEO { bool MemObjHelper::parseMemoryProperties(const cl_mem_properties_intel *properties, MemoryProperties &propertiesStruct) { if (properties == nullptr) { @@ -57,4 +57,4 @@ bool MemObjHelper::validateExtraMemoryProperties(const MemoryProperties &propert void MemObjHelper::addExtraMemoryProperties(MemoryProperties &properties) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/mem_obj_helper.h b/runtime/mem_obj/mem_obj_helper.h index ec41743308..4eb973d8a4 100644 --- a/runtime/mem_obj/mem_obj_helper.h +++ b/runtime/mem_obj/mem_obj_helper.h @@ -15,7 +15,7 @@ #include "CL/cl.h" #include "mem_obj_types.h" -namespace OCLRT { +namespace NEO { class MemObjHelper { public: @@ -138,4 +138,4 @@ class MemObjHelper { static void addExtraMemoryProperties(MemoryProperties &properties); static bool validateExtraMemoryProperties(const MemoryProperties &properties); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/pipe.cpp b/runtime/mem_obj/pipe.cpp index d2f3f4e7eb..e8a0e86197 100644 --- a/runtime/mem_obj/pipe.cpp +++ b/runtime/mem_obj/pipe.cpp @@ -12,7 +12,7 @@ #include "runtime/mem_obj/mem_obj_helper.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { Pipe::Pipe(Context *context, cl_mem_flags flags, @@ -114,4 +114,4 @@ void Pipe::setPipeArg(void *memory, uint32_t patchSize) { } Pipe::~Pipe() = default; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/mem_obj/pipe.h b/runtime/mem_obj/pipe.h index a8a04e85c6..d9f44846f4 100644 --- a/runtime/mem_obj/pipe.h +++ b/runtime/mem_obj/pipe.h @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "runtime/mem_obj/buffer.h" -namespace OCLRT { +namespace NEO { class Pipe : public MemObj { public: static const size_t intelPipeHeaderReservedSpace = 128; @@ -58,4 +43,4 @@ class Pipe : public MemObj { cl_uint pipePacketSize; cl_uint pipeMaxPackets; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/address_mapper.cpp b/runtime/memory_manager/address_mapper.cpp index 3e269457a9..d274f10eed 100644 --- a/runtime/memory_manager/address_mapper.cpp +++ b/runtime/memory_manager/address_mapper.cpp @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { AddressMapper::AddressMapper() : nextPage(1) { } @@ -64,4 +64,4 @@ void AddressMapper::unmap(void *vm) { mapping.erase(it); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/address_mapper.h b/runtime/memory_manager/address_mapper.h index 5676b8b178..305769c445 100644 --- a/runtime/memory_manager/address_mapper.h +++ b/runtime/memory_manager/address_mapper.h @@ -10,7 +10,7 @@ #include #include -namespace OCLRT { +namespace NEO { class AddressMapper { public: @@ -31,4 +31,4 @@ class AddressMapper { std::vector mapping; std::atomic nextPage; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/allocations_list.h b/runtime/memory_manager/allocations_list.h index f8fb4ac38f..a87fd9e48a 100644 --- a/runtime/memory_manager/allocations_list.h +++ b/runtime/memory_manager/allocations_list.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class AllocationsList : public IDList { @@ -18,4 +18,4 @@ class AllocationsList : public IDList { private: GraphicsAllocation *detachAllocationImpl(GraphicsAllocation *, void *); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/deferrable_allocation_deletion.cpp b/runtime/memory_manager/deferrable_allocation_deletion.cpp index e8ee2446b3..b139e0fbdc 100644 --- a/runtime/memory_manager/deferrable_allocation_deletion.cpp +++ b/runtime/memory_manager/deferrable_allocation_deletion.cpp @@ -12,7 +12,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" -namespace OCLRT { +namespace NEO { DeferrableAllocationDeletion::DeferrableAllocationDeletion(MemoryManager &memoryManager, GraphicsAllocation &graphicsAllocation) : memoryManager(memoryManager), graphicsAllocation(graphicsAllocation) {} @@ -36,4 +36,4 @@ bool DeferrableAllocationDeletion::apply() { memoryManager.freeGraphicsMemory(&graphicsAllocation); return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/deferrable_allocation_deletion.h b/runtime/memory_manager/deferrable_allocation_deletion.h index 677c12782c..caf9b5bf5b 100644 --- a/runtime/memory_manager/deferrable_allocation_deletion.h +++ b/runtime/memory_manager/deferrable_allocation_deletion.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/deferrable_deletion.h" -namespace OCLRT { +namespace NEO { class GraphicsAllocation; class MemoryManager; @@ -22,4 +22,4 @@ class DeferrableAllocationDeletion : public DeferrableDeletion { MemoryManager &memoryManager; GraphicsAllocation &graphicsAllocation; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/deferrable_deletion.h b/runtime/memory_manager/deferrable_deletion.h index f8ec4c3f97..b10d078012 100644 --- a/runtime/memory_manager/deferrable_deletion.h +++ b/runtime/memory_manager/deferrable_deletion.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/utilities/idlist.h" -namespace OCLRT { +namespace NEO { class DeferrableDeletion : public IDNode { public: template @@ -16,4 +16,4 @@ class DeferrableDeletion : public IDNode { virtual bool apply() = 0; virtual ~DeferrableDeletion() = default; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/deferred_deleter.cpp b/runtime/memory_manager/deferred_deleter.cpp index 64babddff1..fea556a426 100644 --- a/runtime/memory_manager/deferred_deleter.cpp +++ b/runtime/memory_manager/deferred_deleter.cpp @@ -10,7 +10,7 @@ #include "runtime/memory_manager/deferrable_deletion.h" #include "runtime/os_interface/os_thread.h" -namespace OCLRT { +namespace NEO { DeferredDeleter::DeferredDeleter() { doWorkInBackground = false; elementsToRelease = 0; @@ -124,4 +124,4 @@ void DeferredDeleter::clearQueue() { } } while (!queue.peekIsEmpty()); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/deferred_deleter.h b/runtime/memory_manager/deferred_deleter.h index 84904a97f9..44d3c4e1d9 100644 --- a/runtime/memory_manager/deferred_deleter.h +++ b/runtime/memory_manager/deferred_deleter.h @@ -13,7 +13,7 @@ #include #include -namespace OCLRT { +namespace NEO { class DeferrableDeletion; class Thread; class DeferredDeleter { @@ -51,4 +51,4 @@ class DeferredDeleter { std::mutex threadMutex; std::condition_variable condition; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/definitions/engine_limits.h b/runtime/memory_manager/definitions/engine_limits.h index 48eb784649..4baf155ad8 100644 --- a/runtime/memory_manager/definitions/engine_limits.h +++ b/runtime/memory_manager/definitions/engine_limits.h @@ -8,10 +8,10 @@ #pragma once #include -namespace OCLRT { +namespace NEO { constexpr uint32_t numGpgpuEngineInstances = 2u; constexpr uint32_t maxOsContextCount = numGpgpuEngineInstances; constexpr uint32_t maxHandleCount = 1u; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/definitions/storage_info.cpp b/runtime/memory_manager/definitions/storage_info.cpp index be765fc66a..2b99cb0eda 100644 --- a/runtime/memory_manager/definitions/storage_info.cpp +++ b/runtime/memory_manager/definitions/storage_info.cpp @@ -7,9 +7,9 @@ #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { StorageInfo GraphicsAllocation::createStorageInfoFromProperties(const AllocationProperties &properties) { return {}; } uint32_t StorageInfo::getNumHandles() const { return 1u; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/definitions/storage_info.h b/runtime/memory_manager/definitions/storage_info.h index 07867a5bec..b8287704ad 100644 --- a/runtime/memory_manager/definitions/storage_info.h +++ b/runtime/memory_manager/definitions/storage_info.h @@ -7,8 +7,8 @@ #pragma once #include -namespace OCLRT { +namespace NEO { struct StorageInfo { uint32_t getNumHandles() const; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/gfx_partition.cpp b/runtime/memory_manager/gfx_partition.cpp index 980a35f1de..b43bdaacbd 100644 --- a/runtime/memory_manager/gfx_partition.cpp +++ b/runtime/memory_manager/gfx_partition.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/ptr_math.h" -namespace OCLRT { +namespace NEO { const std::array GfxPartition::heap32Names{{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, HeapIndex::HEAP_INTERNAL, @@ -62,4 +62,4 @@ void GfxPartition::init(uint64_t gpuAddressSpace) { heapInit(HeapIndex::HEAP_STANDARD64KB, gfxBaseAligned, gfxStandardSize - ptrDiff(gfxBaseAligned, gfxBase)); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/gfx_partition.h b/runtime/memory_manager/gfx_partition.h index 2eee9595f5..bba4810664 100644 --- a/runtime/memory_manager/gfx_partition.h +++ b/runtime/memory_manager/gfx_partition.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { enum class HeapIndex : uint32_t { HEAP_INTERNAL_DEVICE_MEMORY = 0u, @@ -81,4 +81,4 @@ class GfxPartition { std::array(HeapIndex::TOTAL_HEAPS)> heap; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/graphics_allocation.cpp b/runtime/memory_manager/graphics_allocation.cpp index 3bb5ebb91f..57e47ec7db 100644 --- a/runtime/memory_manager/graphics_allocation.cpp +++ b/runtime/memory_manager/graphics_allocation.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { void GraphicsAllocation::setAllocationType(AllocationType allocationType) { DebugManager.logAllocation(this); @@ -57,4 +57,4 @@ std::string GraphicsAllocation::getAllocationInfoString() const { constexpr uint32_t GraphicsAllocation::objectNotUsed; constexpr uint32_t GraphicsAllocation::objectNotResident; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h index 1fa450c1bc..37d86f95ff 100644 --- a/runtime/memory_manager/graphics_allocation.h +++ b/runtime/memory_manager/graphics_allocation.h @@ -24,7 +24,7 @@ #include #include -namespace OCLRT { +namespace NEO { using osHandle = unsigned int; enum class HeapIndex : uint32_t; @@ -261,4 +261,4 @@ class GraphicsAllocation : public IDNode { std::atomic registeredContextsNum{0}; std::array gmms{}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/host_ptr_defines.h b/runtime/memory_manager/host_ptr_defines.h index 48bba93249..057faf0752 100644 --- a/runtime/memory_manager/host_ptr_defines.h +++ b/runtime/memory_manager/host_ptr_defines.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct OsHandle; @@ -84,4 +84,4 @@ struct CheckedFragments { OverlapStatus status[maxFragmentsCount]; size_t count = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/host_ptr_manager.cpp b/runtime/memory_manager/host_ptr_manager.cpp index f8f5b89af8..3ca248e741 100644 --- a/runtime/memory_manager/host_ptr_manager.cpp +++ b/runtime/memory_manager/host_ptr_manager.cpp @@ -11,7 +11,7 @@ #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_manager.h" -using namespace OCLRT; +using namespace NEO; HostPtrFragmentsContainer::iterator HostPtrManager::findElement(const void *ptr) { auto nextElement = partialAllocations.lower_bound(ptr); diff --git a/runtime/memory_manager/host_ptr_manager.h b/runtime/memory_manager/host_ptr_manager.h index 361c7286d8..3cabd8a09a 100644 --- a/runtime/memory_manager/host_ptr_manager.h +++ b/runtime/memory_manager/host_ptr_manager.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { using HostPtrFragmentsContainer = std::map; class MemoryManager; @@ -34,4 +34,4 @@ class HostPtrManager { HostPtrFragmentsContainer partialAllocations; std::recursive_mutex allocationsMutex; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/internal_allocation_storage.cpp b/runtime/memory_manager/internal_allocation_storage.cpp index b9fec32df8..ae667f16fe 100644 --- a/runtime/memory_manager/internal_allocation_storage.cpp +++ b/runtime/memory_manager/internal_allocation_storage.cpp @@ -11,7 +11,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" -namespace OCLRT { +namespace NEO { InternalAllocationStorage::InternalAllocationStorage(CommandStreamReceiver &commandStreamReceiver) : commandStreamReceiver(commandStreamReceiver){}; void InternalAllocationStorage::storeAllocation(std::unique_ptr gfxAllocation, uint32_t allocationUsage) { uint32_t taskCount = gfxAllocation->getTaskCount(commandStreamReceiver.getOsContext().getContextId()); @@ -96,4 +96,4 @@ GraphicsAllocation *AllocationsList::detachAllocationImpl(GraphicsAllocation *, return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/internal_allocation_storage.h b/runtime/memory_manager/internal_allocation_storage.h index dc556d9f8f..e217070451 100644 --- a/runtime/memory_manager/internal_allocation_storage.h +++ b/runtime/memory_manager/internal_allocation_storage.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/allocations_list.h" -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class InternalAllocationStorage { @@ -29,4 +29,4 @@ class InternalAllocationStorage { AllocationsList temporaryAllocations; AllocationsList allocationsForReuse; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index b59a2ebc52..ca9dc0b205 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -31,7 +31,7 @@ #include -namespace OCLRT { +namespace NEO { MemoryManager::MemoryManager(ExecutionEnvironment &executionEnvironment) : allocator32Bit(nullptr), executionEnvironment(executionEnvironment), hostPtrManager(std::make_unique()), multiContextResourceDestructor(std::make_unique()) { @@ -444,4 +444,4 @@ void MemoryManager::waitForEnginesCompletion(GraphicsAllocation &graphicsAllocat } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index 36fac1edf3..edc114a644 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -22,7 +22,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class DeferredDeleter; class ExecutionEnvironment; @@ -277,4 +277,4 @@ class MemoryManager { }; std::unique_ptr createDeferredDeleter(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index 5d9c7c27e4..fc51563262 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { OsAgnosticMemoryManager::~OsAgnosticMemoryManager() { applyCommonCleanup(); @@ -270,4 +270,4 @@ void *OsAgnosticMemoryManager::reserveCpuAddressRange(size_t size) { void OsAgnosticMemoryManager::releaseReservedCpuAddressRange(void *reserved, size_t size) { alignedFreeWrapper(reserved); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/os_agnostic_memory_manager.h b/runtime/memory_manager/os_agnostic_memory_manager.h index a0be93db06..e9e06d71ed 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.h +++ b/runtime/memory_manager/os_agnostic_memory_manager.h @@ -11,7 +11,7 @@ #include "runtime/helpers/options.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { constexpr size_t bigAllocation = 1 * MB; constexpr uintptr_t dummyAddress = 0xFFFFF000u; class MemoryAllocation : public GraphicsAllocation { @@ -82,4 +82,4 @@ class OsAgnosticMemoryManager : public MemoryManager { unsigned long long counter = 0; bool fakeBigAllocations = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp b/runtime/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp index 0f2a299001..ec91df23c2 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/memory_manager/os_agnostic_memory_manager.h" -namespace OCLRT { +namespace NEO { GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { return MemoryManager::allocateGraphicsMemoryInDevicePool(allocationData, status); } @@ -15,4 +15,4 @@ GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryInDevicePool( void MemoryAllocation::overrideMemoryPool(MemoryPool::Type pool) { this->memoryPool = pool; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/page_table.cpp b/runtime/memory_manager/page_table.cpp index 82d3d36117..c805e17f48 100644 --- a/runtime/memory_manager/page_table.cpp +++ b/runtime/memory_manager/page_table.cpp @@ -10,7 +10,7 @@ #include "runtime/aub_mem_dump/page_table_entry_bits.h" #include "runtime/memory_manager/page_table.inl" -namespace OCLRT { +namespace NEO { uintptr_t PTE::map(uintptr_t vm, size_t size, uint64_t entryBits, uint32_t memoryBank) { const size_t shift = 12; @@ -66,4 +66,4 @@ void PTE::pageWalk(uintptr_t vm, size_t size, size_t offset, uint64_t entryBits, template class PageTable; template class PageTable; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/page_table.h b/runtime/memory_manager/page_table.h index d6eceded36..8c2f68018e 100644 --- a/runtime/memory_manager/page_table.h +++ b/runtime/memory_manager/page_table.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; @@ -84,4 +84,4 @@ class PDPE : public PageTable { PDPE(PhysicalAddressAllocator *physicalAddressAllocator) : PageTable(physicalAddressAllocator) { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/page_table.inl b/runtime/memory_manager/page_table.inl index bc9f12b3ad..8ab79bc6ee 100644 --- a/runtime/memory_manager/page_table.inl +++ b/runtime/memory_manager/page_table.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ -namespace OCLRT { +namespace NEO { template <> inline uintptr_t PageTable::map(uintptr_t vm, size_t size, uint64_t entryBits, uint32_t memoryBank) { @@ -68,4 +68,4 @@ inline void PageTable::pageWalk(uintptr_t vm, size_t size, size_ offset += (vmEnd - vmStart + 1); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/physical_address_allocator.h b/runtime/memory_manager/physical_address_allocator.h index 11f7b35f2b..00ff83b383 100644 --- a/runtime/memory_manager/physical_address_allocator.h +++ b/runtime/memory_manager/physical_address_allocator.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { class PhysicalAddressAllocator { public: @@ -49,4 +49,4 @@ class PhysicalAddressAllocator { const uint64_t initialPageAddress = 0x1000; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/residency.cpp b/runtime/memory_manager/residency.cpp index 4afde5431b..0adf11bf3c 100644 --- a/runtime/memory_manager/residency.cpp +++ b/runtime/memory_manager/residency.cpp @@ -9,7 +9,7 @@ #include "runtime/os_interface/os_context.h" -using namespace OCLRT; +using namespace NEO; void ResidencyData::updateCompletionData(uint64_t newFenceValue, uint32_t contextId) { lastFenceValues[contextId] = newFenceValue; diff --git a/runtime/memory_manager/residency.h b/runtime/memory_manager/residency.h index 6bba5ec834..ed2ad177bd 100644 --- a/runtime/memory_manager/residency.h +++ b/runtime/memory_manager/residency.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct ResidencyData { bool resident[maxOsContextCount] = {}; @@ -22,4 +22,4 @@ struct ResidencyData { protected: std::array lastFenceValues = {}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/residency_container.h b/runtime/memory_manager/residency_container.h index a250a191bc..397b553323 100644 --- a/runtime/memory_manager/residency_container.h +++ b/runtime/memory_manager/residency_container.h @@ -9,9 +9,9 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; using ResidencyContainer = std::vector; using AllocationView = std::pair; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/surface.h b/runtime/memory_manager/surface.h index d64f93f9dc..51c2483c43 100644 --- a/runtime/memory_manager/surface.h +++ b/runtime/memory_manager/surface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class CommandQueue; class Surface { public: @@ -118,4 +118,4 @@ class GeneralSurface : public Surface { protected: GraphicsAllocation *gfxAllocation; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/svm_memory_manager.cpp b/runtime/memory_manager/svm_memory_manager.cpp index 4fd6b55f3c..a41718a78d 100644 --- a/runtime/memory_manager/svm_memory_manager.cpp +++ b/runtime/memory_manager/svm_memory_manager.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { void SVMAllocsManager::MapBasedAllocationTracker::insert(GraphicsAllocation &ga) { allocs.insert(std::make_pair(ga.getUnderlyingBuffer(), &ga)); @@ -83,4 +83,4 @@ void SVMAllocsManager::freeSVMAlloc(void *ptr) { bool SVMAllocsManager::memFlagIsReadOnly(cl_svm_mem_flags flags) { return (flags & (CL_MEM_READ_ONLY | CL_MEM_HOST_READ_ONLY | CL_MEM_HOST_NO_ACCESS)) != 0; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/memory_manager/svm_memory_manager.h b/runtime/memory_manager/svm_memory_manager.h index 4df1c1145e..832e988641 100644 --- a/runtime/memory_manager/svm_memory_manager.h +++ b/runtime/memory_manager/svm_memory_manager.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Device; class GraphicsAllocation; class CommandStreamReceiver; @@ -43,4 +43,4 @@ class SVMAllocsManager { MemoryManager *memoryManager; std::mutex mtx; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/32bit_memory.h b/runtime/os_interface/32bit_memory.h index 90fb4643b0..312c50859b 100644 --- a/runtime/os_interface/32bit_memory.h +++ b/runtime/os_interface/32bit_memory.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { const uintptr_t max32BitAddress = 0xffffffff; extern bool is32BitOsAllocatorAvailable; class Allocator32bit { @@ -34,4 +34,4 @@ class Allocator32bit { uint64_t base = 0; uint64_t size = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/debug_settings_manager.cpp b/runtime/os_interface/debug_settings_manager.cpp index dc1ec9b4ab..8b5c286a4e 100644 --- a/runtime/os_interface/debug_settings_manager.cpp +++ b/runtime/os_interface/debug_settings_manager.cpp @@ -22,7 +22,7 @@ #include #include -namespace OCLRT { +namespace NEO { DebugSettingsManager DebugManager; @@ -332,4 +332,4 @@ const char *DebugSettingsManager::getAllocationTypeString(GraphicsAl template class DebugSettingsManager; template class DebugSettingsManager; template class DebugSettingsManager; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/os_interface/debug_settings_manager.h b/runtime/os_interface/debug_settings_manager.h index c1d3db01e3..01201f2732 100644 --- a/runtime/os_interface/debug_settings_manager.h +++ b/runtime/os_interface/debug_settings_manager.h @@ -28,7 +28,7 @@ constexpr DebugFunctionalityLevel globalDebugFunctionalityLevel = DebugFunctiona constexpr DebugFunctionalityLevel globalDebugFunctionalityLevel = DebugFunctionalityLevel::None; #endif -namespace OCLRT { +namespace NEO { template void printDebugString(bool showDebugLogs, Args &&... args) { if (showDebugLogs) { @@ -283,7 +283,7 @@ class DebugSettingsApiEnterWrapper { const char *funcName; const int *errorCode; }; -}; // namespace OCLRT +}; // namespace NEO #define DECLARE_DEBUG_VARIABLE(dataType, variableName, defaultValue, description) @@ -291,7 +291,7 @@ class DebugSettingsApiEnterWrapper { DBG_MANAGER.logLazyEvaluateArgs(DBG_MANAGER.flags.PREDICATE.get(), [&] { DBG_MANAGER.LOG_FUNCTION(__VA_ARGS__); }) #define DBG_LOG(PREDICATE, ...) \ - DBG_LOG_LAZY_EVALUATE_ARGS(OCLRT::DebugManager, PREDICATE, log, OCLRT::DebugManager.flags.PREDICATE.get(), __VA_ARGS__) + DBG_LOG_LAZY_EVALUATE_ARGS(NEO::DebugManager, PREDICATE, log, NEO::DebugManager.flags.PREDICATE.get(), __VA_ARGS__) #define DBG_LOG_INPUTS(...) \ - DBG_LOG_LAZY_EVALUATE_ARGS(OCLRT::DebugManager, LogApiCalls, logInputs, __VA_ARGS__) + DBG_LOG_LAZY_EVALUATE_ARGS(NEO::DebugManager, LogApiCalls, logInputs, __VA_ARGS__) diff --git a/runtime/os_interface/definitions/translate_debug_settings.cpp b/runtime/os_interface/definitions/translate_debug_settings.cpp index a17b142d14..64562bd3e8 100644 --- a/runtime/os_interface/definitions/translate_debug_settings.cpp +++ b/runtime/os_interface/definitions/translate_debug_settings.cpp @@ -7,10 +7,10 @@ #include "runtime/os_interface/definitions/translate_debug_settings.h" -namespace OCLRT { +namespace NEO { void translateDebugSettings(DebugVariables &debugVariables) { translateDebugSettingsBase(debugVariables); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/definitions/translate_debug_settings.h b/runtime/os_interface/definitions/translate_debug_settings.h index acf791a412..8ef454d490 100644 --- a/runtime/os_interface/definitions/translate_debug_settings.h +++ b/runtime/os_interface/definitions/translate_debug_settings.h @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { struct DebugVariables; @@ -16,4 +16,4 @@ inline void translateDebugSettingsBase(DebugVariables &) { void translateDebugSettings(DebugVariables &); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/device_factory.cpp b/runtime/os_interface/device_factory.cpp index bc26d034ca..46949cf82c 100644 --- a/runtime/os_interface/device_factory.cpp +++ b/runtime/os_interface/device_factory.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" -namespace OCLRT { +namespace NEO { bool DeviceFactory::getDevicesForProductFamilyOverride(HardwareInfo **pHWInfos, size_t &numDevices, ExecutionEnvironment &executionEnvironment) { auto totalDeviceCount = 1u; @@ -42,4 +42,4 @@ bool DeviceFactory::getDevicesForProductFamilyOverride(HardwareInfo **pHWInfos, return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/device_factory.h b/runtime/os_interface/device_factory.h index 8739cabe05..fbfaec7045 100644 --- a/runtime/os_interface/device_factory.h +++ b/runtime/os_interface/device_factory.h @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class ExecutionEnvironment; @@ -29,4 +29,4 @@ class DeviceFactoryCleaner { ~DeviceFactoryCleaner() { DeviceFactory::releaseDevices(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/hw_info_config.h b/runtime/os_interface/hw_info_config.h index 56237e49c0..fb4e6086e9 100644 --- a/runtime/os_interface/hw_info_config.h +++ b/runtime/os_interface/hw_info_config.h @@ -11,7 +11,7 @@ #include "igfxfmid.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; class OSInterface; @@ -55,4 +55,4 @@ struct EnableProductHwInfoConfig { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/hw_info_config.inl b/runtime/os_interface/hw_info_config.inl index d059d2f2ef..c70f1a7fbd 100644 --- a/runtime/os_interface/hw_info_config.inl +++ b/runtime/os_interface/hw_info_config.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "runtime/os_interface/hw_info_config.h" -namespace OCLRT { +namespace NEO { template void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/allocator_helper.h b/runtime/os_interface/linux/allocator_helper.h index adcad8f777..02966e86d5 100644 --- a/runtime/os_interface/linux/allocator_helper.h +++ b/runtime/os_interface/linux/allocator_helper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,6 @@ #pragma once #include -namespace OCLRT { +namespace NEO { size_t getSizeToMap(); -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/os_interface/linux/api_linux.cpp b/runtime/os_interface/linux/api_linux.cpp index 41cdff9f36..6601da66c8 100644 --- a/runtime/os_interface/linux/api_linux.cpp +++ b/runtime/os_interface/linux/api_linux.cpp @@ -12,7 +12,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj.h" -void OCLRT::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { +void NEO::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { switch (paramName) { #ifdef LIBVA case CL_MEM_VA_API_MEDIA_SURFACE_INTEL: @@ -24,7 +24,7 @@ void OCLRT::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, siz } } -void OCLRT::Image::getOsSpecificImageInfo(const cl_image_info ¶mName, size_t *srcParamSize, void **srcParam) { +void NEO::Image::getOsSpecificImageInfo(const cl_image_info ¶mName, size_t *srcParamSize, void **srcParam) { switch (paramName) { #ifdef LIBVA case CL_IMAGE_VA_API_PLANE_INTEL: @@ -37,6 +37,6 @@ void OCLRT::Image::getOsSpecificImageInfo(const cl_image_info ¶mName, size_t } } -void *OCLRT::Context::getOsContextInfo(cl_context_info ¶mName, size_t *srcParamSize) { +void *NEO::Context::getOsContextInfo(cl_context_info ¶mName, size_t *srcParamSize) { return nullptr; } diff --git a/runtime/os_interface/linux/d3d_sharing_functions.h b/runtime/os_interface/linux/d3d_sharing_functions.h index 5c39f67ad6..f1abe529e2 100644 --- a/runtime/os_interface/linux/d3d_sharing_functions.h +++ b/runtime/os_interface/linux/d3d_sharing_functions.h @@ -1,28 +1,13 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -namespace OCLRT { +namespace NEO { namespace D3DTypesHelper { struct D3D9 { @@ -36,4 +21,4 @@ struct D3D11 { template class D3DSharingFunctions { }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/debug_env_reader.cpp b/runtime/os_interface/linux/debug_env_reader.cpp index 1816756e6f..b1595b3df0 100644 --- a/runtime/os_interface/linux/debug_env_reader.cpp +++ b/runtime/os_interface/linux/debug_env_reader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/utilities/linux/debug_env_reader.h" -namespace OCLRT { +namespace NEO { SettingsReader *SettingsReader::createOsReader(bool userScope) { return new EnvironmentVariableReader; @@ -46,4 +46,4 @@ std::string EnvironmentVariableReader::getSetting(const char *settingName, const } return keyValue; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/device_command_stream.inl b/runtime/os_interface/linux/device_command_stream.inl index 27ce7d9d6f..1365b5f9d3 100644 --- a/runtime/os_interface/linux/device_command_stream.inl +++ b/runtime/os_interface/linux/device_command_stream.inl @@ -12,7 +12,7 @@ #include "drm_command_stream.h" #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { template CommandStreamReceiver *DeviceCommandStreamReceiver::create(bool withAubDump, ExecutionEnvironment &executionEnvironment) { @@ -22,4 +22,4 @@ CommandStreamReceiver *DeviceCommandStreamReceiver::create(bool withA return new DrmCommandStreamReceiver(executionEnvironment); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/device_factory_linux.cpp b/runtime/os_interface/linux/device_factory_linux.cpp index 080dbb03f1..2d68fd21a2 100644 --- a/runtime/os_interface/linux/device_factory_linux.cpp +++ b/runtime/os_interface/linux/device_factory_linux.cpp @@ -19,7 +19,7 @@ #include #include -namespace OCLRT { +namespace NEO { size_t DeviceFactory::numDevices = 0; HardwareInfo *DeviceFactory::hwInfo = nullptr; @@ -73,4 +73,4 @@ void DeviceFactory::releaseDevices() { void Device::appendOSExtensions(std::string &deviceExtensions) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/driver_info.cpp b/runtime/os_interface/linux/driver_info.cpp index b7dc67b8f4..abeecf9a82 100644 --- a/runtime/os_interface/linux/driver_info.cpp +++ b/runtime/os_interface/linux/driver_info.cpp @@ -1,30 +1,15 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #include "runtime/device/driver_info.h" -namespace OCLRT { +namespace NEO { DriverInfo *DriverInfo::create(OSInterface *osInterface) { return new DriverInfo(); }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/os_interface/linux/drm_32bit_memory.cpp b/runtime/os_interface/linux/drm_32bit_memory.cpp index ffac788bef..fe369d71d6 100644 --- a/runtime/os_interface/linux/drm_32bit_memory.cpp +++ b/runtime/os_interface/linux/drm_32bit_memory.cpp @@ -14,7 +14,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; class Allocator32bit::OsInternals { public: @@ -24,16 +24,16 @@ class Allocator32bit::OsInternals { size_t heapSize = 0; }; -bool OCLRT::is32BitOsAllocatorAvailable = true; +bool NEO::is32BitOsAllocatorAvailable = true; Allocator32bit::Allocator32bit(uint64_t base, uint64_t size) : base(base), size(size) { heapAllocator = std::make_unique(base, size); } -OCLRT::Allocator32bit::Allocator32bit() : Allocator32bit(new OsInternals) { +NEO::Allocator32bit::Allocator32bit() : Allocator32bit(new OsInternals) { } -OCLRT::Allocator32bit::Allocator32bit(Allocator32bit::OsInternals *osInternalsIn) : osInternals(osInternalsIn) { +NEO::Allocator32bit::Allocator32bit(Allocator32bit::OsInternals *osInternalsIn) : osInternals(osInternalsIn) { size_t sizeToMap = getSizeToMap(); void *ptr = this->osInternals->mmapFunction(nullptr, sizeToMap, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); @@ -59,14 +59,14 @@ OCLRT::Allocator32bit::Allocator32bit(Allocator32bit::OsInternals *osInternalsIn heapAllocator = std::unique_ptr(new HeapAllocator(base, sizeToMap)); } -OCLRT::Allocator32bit::~Allocator32bit() { +NEO::Allocator32bit::~Allocator32bit() { if (this->osInternals.get() != nullptr) { if (this->osInternals->heapBasePtr != nullptr) this->osInternals->munmapFunction(this->osInternals->heapBasePtr, this->osInternals->heapSize); } } -uint64_t OCLRT::Allocator32bit::allocate(size_t &size) { +uint64_t NEO::Allocator32bit::allocate(size_t &size) { return this->heapAllocator->allocate(size); } diff --git a/runtime/os_interface/linux/drm_allocation.cpp b/runtime/os_interface/linux/drm_allocation.cpp index 1f0e7d49c3..0dc1c465c5 100644 --- a/runtime/os_interface/linux/drm_allocation.cpp +++ b/runtime/os_interface/linux/drm_allocation.cpp @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { std::string DrmAllocation::getAllocationInfoString() const { std::stringstream ss; if (bo != nullptr) { @@ -19,4 +19,4 @@ std::string DrmAllocation::getAllocationInfoString() const { } return ss.str(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_allocation.h b/runtime/os_interface/linux/drm_allocation.h index 8392678342..2497faa03d 100644 --- a/runtime/os_interface/linux/drm_allocation.h +++ b/runtime/os_interface/linux/drm_allocation.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class BufferObject; struct OsHandle { @@ -39,4 +39,4 @@ class DrmAllocation : public GraphicsAllocation { protected: BufferObject *bo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_buffer_object.cpp b/runtime/os_interface/linux/drm_buffer_object.cpp index 9b52834e86..958850b70d 100644 --- a/runtime/os_interface/linux/drm_buffer_object.cpp +++ b/runtime/os_interface/linux/drm_buffer_object.cpp @@ -27,7 +27,7 @@ #include #include -namespace OCLRT { +namespace NEO { BufferObject::BufferObject(Drm *drm, int handle, bool isAllocated) : drm(drm), refCount(1), handle(handle), isReused(false), isAllocated(isAllocated) { this->tiling_mode = I915_TILING_NONE; @@ -170,4 +170,4 @@ int BufferObject::pin(BufferObject *const boToPin[], size_t numberOfBos, uint32_ return err; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_buffer_object.h b/runtime/os_interface/linux/drm_buffer_object.h index 9a26806c71..5295f1d8cf 100644 --- a/runtime/os_interface/linux/drm_buffer_object.h +++ b/runtime/os_interface/linux/drm_buffer_object.h @@ -16,7 +16,7 @@ struct drm_i915_gem_exec_object2; struct drm_i915_gem_relocation_entry; -namespace OCLRT { +namespace NEO { class DrmMemoryManager; class Drm; @@ -91,4 +91,4 @@ class BufferObject { uint64_t unmapSize = 0; StorageAllocatorType storageAllocatorType = UNKNOWN_ALLOCATOR; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_command_stream.h b/runtime/os_interface/linux/drm_command_stream.h index 6f3a55abc0..28f856f44a 100644 --- a/runtime/os_interface/linux/drm_command_stream.h +++ b/runtime/os_interface/linux/drm_command_stream.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { class BufferObject; class Drm; class DrmMemoryManager; @@ -56,4 +56,4 @@ class DrmCommandStreamReceiver : public DeviceCommandStreamReceiver { Drm *drm; gemCloseWorkerMode gemCloseWorkerOperationMode; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl index 2f1d09defe..257305e194 100644 --- a/runtime/os_interface/linux/drm_command_stream.inl +++ b/runtime/os_interface/linux/drm_command_stream.inl @@ -25,7 +25,7 @@ #include #include -namespace OCLRT { +namespace NEO { template DrmCommandStreamReceiver::DrmCommandStreamReceiver(ExecutionEnvironment &executionEnvironment, gemCloseWorkerMode mode) @@ -156,4 +156,4 @@ bool DrmCommandStreamReceiver::waitForFlushStamp(FlushStamp &flushSta return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_engine_mapper.cpp b/runtime/os_interface/linux/drm_engine_mapper.cpp index b8de82c81e..bf36b08e25 100644 --- a/runtime/os_interface/linux/drm_engine_mapper.cpp +++ b/runtime/os_interface/linux/drm_engine_mapper.cpp @@ -10,7 +10,7 @@ #include "drm/i915_drm.h" #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { unsigned int DrmEngineMapper::engineNodeMap(EngineType engineType) { if (EngineType::ENGINE_RCS == engineType) { @@ -18,4 +18,4 @@ unsigned int DrmEngineMapper::engineNodeMap(EngineType engineType) { } UNRECOVERABLE_IF(true); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_engine_mapper.h b/runtime/os_interface/linux/drm_engine_mapper.h index 75146d4a31..3cc23e74fb 100644 --- a/runtime/os_interface/linux/drm_engine_mapper.h +++ b/runtime/os_interface/linux/drm_engine_mapper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,11 +9,11 @@ #include "engine_node.h" -namespace OCLRT { +namespace NEO { class DrmEngineMapper { public: static unsigned int engineNodeMap(EngineType engineType); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_gem_close_worker.cpp b/runtime/os_interface/linux/drm_gem_close_worker.cpp index e1b65a45af..bd5d12cb0e 100644 --- a/runtime/os_interface/linux/drm_gem_close_worker.cpp +++ b/runtime/os_interface/linux/drm_gem_close_worker.cpp @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { DrmGemCloseWorker::DrmGemCloseWorker(DrmMemoryManager &memoryManager) : memoryManager(memoryManager) { thread = Thread::create(worker, reinterpret_cast(this)); @@ -104,4 +104,4 @@ void *DrmGemCloseWorker::worker(void *arg) { self->workerDone.store(true); return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_gem_close_worker.h b/runtime/os_interface/linux/drm_gem_close_worker.h index 599dd09dc3..2113677a90 100644 --- a/runtime/os_interface/linux/drm_gem_close_worker.h +++ b/runtime/os_interface/linux/drm_gem_close_worker.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { class DrmMemoryManager; class BufferObject; class Thread; @@ -54,4 +54,4 @@ class DrmGemCloseWorker { std::condition_variable condition; std::atomic workerDone{false}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_limited_range.cpp b/runtime/os_interface/linux/drm_limited_range.cpp index a76a911694..f17818a580 100644 --- a/runtime/os_interface/linux/drm_limited_range.cpp +++ b/runtime/os_interface/linux/drm_limited_range.cpp @@ -10,22 +10,22 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/linux/allocator_helper.h" -using namespace OCLRT; +using namespace NEO; -OCLRT::AllocatorLimitedRange::AllocatorLimitedRange(uint64_t base, uint64_t size) : base(base), size(size), heapAllocator(std::make_unique(base, size)) { +NEO::AllocatorLimitedRange::AllocatorLimitedRange(uint64_t base, uint64_t size) : base(base), size(size), heapAllocator(std::make_unique(base, size)) { } -uint64_t OCLRT::AllocatorLimitedRange::allocate(size_t &size) { +uint64_t NEO::AllocatorLimitedRange::allocate(size_t &size) { if (size >= this->size) { return 0llu; } return this->heapAllocator->allocate(size); } -void OCLRT::AllocatorLimitedRange::free(uint64_t ptr, size_t size) { +void NEO::AllocatorLimitedRange::free(uint64_t ptr, size_t size) { this->heapAllocator->free(ptr, size); } -uint64_t OCLRT::AllocatorLimitedRange::getBase() const { +uint64_t NEO::AllocatorLimitedRange::getBase() const { return base; } diff --git a/runtime/os_interface/linux/drm_limited_range.h b/runtime/os_interface/linux/drm_limited_range.h index f1662cf478..c48ff02eea 100644 --- a/runtime/os_interface/linux/drm_limited_range.h +++ b/runtime/os_interface/linux/drm_limited_range.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class AllocatorLimitedRange { public: AllocatorLimitedRange(uint64_t base, uint64_t size); @@ -31,4 +31,4 @@ class AllocatorLimitedRange { uint64_t size = 0; std::unique_ptr heapAllocator; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_memory_manager.cpp b/runtime/os_interface/linux/drm_memory_manager.cpp index 77a4097656..ddf77298a6 100644 --- a/runtime/os_interface/linux/drm_memory_manager.cpp +++ b/runtime/os_interface/linux/drm_memory_manager.cpp @@ -27,7 +27,7 @@ #include #include -namespace OCLRT { +namespace NEO { DrmMemoryManager::DrmMemoryManager(gemCloseWorkerMode mode, bool forcePinAllowed, @@ -103,19 +103,19 @@ void DrmMemoryManager::initInternalRangeAllocator(size_t gpuRange) { } } -void DrmMemoryManager::eraseSharedBufferObject(OCLRT::BufferObject *bo) { +void DrmMemoryManager::eraseSharedBufferObject(NEO::BufferObject *bo) { auto it = std::find(sharingBufferObjects.begin(), sharingBufferObjects.end(), bo); //If an object isReused = true, it must be in the vector DEBUG_BREAK_IF(it == sharingBufferObjects.end()); sharingBufferObjects.erase(it); } -void DrmMemoryManager::pushSharedBufferObject(OCLRT::BufferObject *bo) { +void DrmMemoryManager::pushSharedBufferObject(NEO::BufferObject *bo) { bo->isReused = true; sharingBufferObjects.push_back(bo); } -uint32_t DrmMemoryManager::unreference(OCLRT::BufferObject *bo, bool synchronousDestroy) { +uint32_t DrmMemoryManager::unreference(NEO::BufferObject *bo, bool synchronousDestroy) { if (!bo) return -1; @@ -195,7 +195,7 @@ void DrmMemoryManager::releaseGpuRange(void *address, size_t unmapSize, StorageA limitedGpuAddressRangeAllocator->free(graphicsAddress, unmapSize); } -OCLRT::BufferObject *DrmMemoryManager::allocUserptr(uintptr_t address, size_t size, uint64_t flags, bool softpin) { +NEO::BufferObject *DrmMemoryManager::allocUserptr(uintptr_t address, size_t size, uint64_t flags, bool softpin) { drm_i915_gem_userptr userptr = {}; userptr.user_ptr = address; userptr.user_size = size; @@ -751,4 +751,4 @@ void *DrmMemoryManager::reserveCpuAddressRange(size_t size) { void DrmMemoryManager::releaseReservedCpuAddressRange(void *reserved, size_t size) { munmapFunction(reserved, size); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_memory_manager.h b/runtime/os_interface/linux/drm_memory_manager.h index 7e2839141b..8bb79dde9e 100644 --- a/runtime/os_interface/linux/drm_memory_manager.h +++ b/runtime/os_interface/linux/drm_memory_manager.h @@ -17,7 +17,7 @@ #include #include -namespace OCLRT { +namespace NEO { class BufferObject; class Drm; @@ -95,4 +95,4 @@ class DrmMemoryManager : public MemoryManager { std::unique_ptr internal32bitAllocator; std::unique_ptr limitedGpuAddressRangeAllocator; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp b/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp index 129fc54ac6..ae7fd0ee90 100644 --- a/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp +++ b/runtime/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp @@ -7,9 +7,9 @@ #include "runtime/os_interface/linux/drm_memory_manager.h" -namespace OCLRT { +namespace NEO { GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { status = AllocationStatus::RetryInNonDevicePool; return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_neo.cpp b/runtime/os_interface/linux/drm_neo.cpp index d5d8141e85..1f8f540d1a 100644 --- a/runtime/os_interface/linux/drm_neo.cpp +++ b/runtime/os_interface/linux/drm_neo.cpp @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { const char *Drm::sysFsDefaultGpuPath = "/drm/card0"; const char *Drm::maxGpuFrequencyFile = "/gt_max_freq_mhz"; @@ -204,4 +204,4 @@ void Drm::setSimplifiedMocsTableUsage(bool value) { useSimplifiedMocsTable = value; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_neo.h b/runtime/os_interface/linux/drm_neo.h index 6dbde6b85f..f1dc8cf140 100644 --- a/runtime/os_interface/linux/drm_neo.h +++ b/runtime/os_interface/linux/drm_neo.h @@ -20,7 +20,7 @@ struct GT_SYSTEM_INFO; -namespace OCLRT { +namespace NEO { #define I915_CONTEXT_PRIVATE_PARAM_BOOST 0x80000000 class DeviceFactory; @@ -124,4 +124,4 @@ class Drm { private: int getParamIoctl(int param, int *dstValue); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_neo_create.cpp b/runtime/os_interface/linux/drm_neo_create.cpp index a5096e3baf..f4dfa95465 100644 --- a/runtime/os_interface/linux/drm_neo_create.cpp +++ b/runtime/os_interface/linux/drm_neo_create.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/linux/drm_neo.h" -namespace OCLRT { +namespace NEO { Drm::~Drm() = default; @@ -22,4 +22,4 @@ Drm *Drm::create(int32_t deviceOrdinal) { void Drm::closeDevice(int32_t deviceOrdinal) { return; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_neo_memory_info.cpp b/runtime/os_interface/linux/drm_neo_memory_info.cpp index eb3c892a02..123eb6a787 100644 --- a/runtime/os_interface/linux/drm_neo_memory_info.cpp +++ b/runtime/os_interface/linux/drm_neo_memory_info.cpp @@ -7,9 +7,9 @@ #include "drm_neo.h" -namespace OCLRT { +namespace NEO { void Drm::queryMemoryInfo() { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/drm_null_device.h b/runtime/os_interface/linux/drm_null_device.h index 9d23ded26d..1f8c2e041c 100644 --- a/runtime/os_interface/linux/drm_null_device.h +++ b/runtime/os_interface/linux/drm_null_device.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { class DrmNullDevice : public Drm { friend Drm; @@ -45,4 +45,4 @@ class DrmNullDevice : public Drm { uint64_t gpuTimestamp; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp index 4c3fcf916d..17e6910098 100644 --- a/runtime/os_interface/linux/hw_info_config.cpp +++ b/runtime/os_interface/linux/hw_info_config.cpp @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { HwInfoConfig *hwInfoConfigFactory[IGFX_MAX_PRODUCT] = {}; @@ -186,4 +186,4 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou return 0; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/memory_info.h b/runtime/os_interface/linux/memory_info.h index 5b89bd9d8b..b696e77ae9 100644 --- a/runtime/os_interface/linux/memory_info.h +++ b/runtime/os_interface/linux/memory_info.h @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { struct MemoryInfo { MemoryInfo() = default; @@ -16,4 +16,4 @@ struct MemoryInfo { inline MemoryInfo::~MemoryInfo(){}; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_context_linux.cpp b/runtime/os_interface/linux/os_context_linux.cpp index c161e27eb4..9b56289151 100644 --- a/runtime/os_interface/linux/os_context_linux.cpp +++ b/runtime/os_interface/linux/os_context_linux.cpp @@ -12,7 +12,7 @@ #include "runtime/os_interface/linux/os_interface.h" #include "runtime/os_interface/os_context.h" -namespace OCLRT { +namespace NEO { OsContext *OsContext::create(OSInterface *osInterface, uint32_t contextId, DeviceBitfield deviceBitfield, EngineType engineType, PreemptionMode preemptionMode, bool lowPriority) { @@ -36,4 +36,4 @@ OsContextLinux::OsContextLinux(Drm &drm, uint32_t contextId, DeviceBitfield devi OsContextLinux::~OsContextLinux() { drm.destroyDrmContext(drmContextId); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_context_linux.h b/runtime/os_interface/linux/os_context_linux.h index d35d139c01..1cbbbb0522 100644 --- a/runtime/os_interface/linux/os_context_linux.h +++ b/runtime/os_interface/linux/os_context_linux.h @@ -7,7 +7,7 @@ #include "runtime/os_interface/os_context.h" -namespace OCLRT { +namespace NEO { class Drm; class OsContextLinux : public OsContext { @@ -25,4 +25,4 @@ class OsContextLinux : public OsContext { uint32_t drmContextId = 0; Drm &drm; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_interface.cpp b/runtime/os_interface/linux/os_interface.cpp index 721244aee4..c7a5054778 100644 --- a/runtime/os_interface/linux/os_interface.cpp +++ b/runtime/os_interface/linux/os_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "os_interface.h" -namespace OCLRT { +namespace NEO { bool OSInterface::osEnabled64kbPages = false; @@ -31,4 +31,4 @@ uint32_t OSInterface::getDeviceHandle() const { return 0; } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/os_interface/linux/os_interface.h b/runtime/os_interface/linux/os_interface.h index 0d64309018..b056f55c3c 100644 --- a/runtime/os_interface/linux/os_interface.h +++ b/runtime/os_interface/linux/os_interface.h @@ -10,7 +10,7 @@ #include "drm_neo.h" -namespace OCLRT { +namespace NEO { class Drm; class OSInterface::OSInterfaceImpl { public: @@ -27,4 +27,4 @@ class OSInterface::OSInterfaceImpl { protected: Drm *drm; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_library.cpp b/runtime/os_interface/linux/os_library.cpp index f1f946b863..6329129a9a 100644 --- a/runtime/os_interface/linux/os_library.cpp +++ b/runtime/os_interface/linux/os_library.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { OsLibrary *OsLibrary::load(const std::string &name) { auto ptr = new (std::nothrow) Linux::OsLibrary(name); if (ptr == nullptr) @@ -52,4 +52,4 @@ void *OsLibrary::getProcAddress(const std::string &procName) { return dlsym(this->handle, procName.c_str()); } } // namespace Linux -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_library.h b/runtime/os_interface/linux/os_library.h index a9cbae3bd0..e28106ecf6 100644 --- a/runtime/os_interface/linux/os_library.h +++ b/runtime/os_interface/linux/os_library.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,10 +8,10 @@ #pragma once #include "runtime/os_interface/os_library.h" -namespace OCLRT { +namespace NEO { namespace Linux { -class OsLibrary : public OCLRT::OsLibrary { +class OsLibrary : public NEO::OsLibrary { private: void *handle; @@ -23,4 +23,4 @@ class OsLibrary : public OCLRT::OsLibrary { void *getProcAddress(const std::string &procName) override; }; } // namespace Linux -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_thread_linux.cpp b/runtime/os_interface/linux/os_thread_linux.cpp index 6cd71c7368..3f641beed7 100644 --- a/runtime/os_interface/linux/os_thread_linux.cpp +++ b/runtime/os_interface/linux/os_thread_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/os_interface/linux/os_thread_linux.h" -namespace OCLRT { +namespace NEO { ThreadLinux::ThreadLinux(pthread_t threadId) : threadId(threadId){}; std::unique_ptr Thread::create(void *(*func)(void *), void *arg) { @@ -19,4 +19,4 @@ std::unique_ptr Thread::create(void *(*func)(void *), void *arg) { void ThreadLinux::join() { pthread_join(threadId, nullptr); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_thread_linux.h b/runtime/os_interface/linux/os_thread_linux.h index 86bbde1eb0..9e99e70e81 100644 --- a/runtime/os_interface/linux/os_thread_linux.h +++ b/runtime/os_interface/linux/os_thread_linux.h @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { class ThreadLinux : public Thread { public: ThreadLinux(pthread_t threadId); @@ -18,4 +18,4 @@ class ThreadLinux : public Thread { protected: pthread_t threadId; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_time_linux.cpp b/runtime/os_interface/linux/os_time_linux.cpp index cffbb86e13..6548633e7a 100644 --- a/runtime/os_interface/linux/os_time_linux.cpp +++ b/runtime/os_interface/linux/os_time_linux.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { OSTimeLinux::OSTimeLinux(OSInterface *osInterface) { this->osInterface = osInterface; @@ -154,4 +154,4 @@ uint64_t OSTimeLinux::getCpuRawTimestamp() { } return timesInNsec / ticksInNsec; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/os_time_linux.h b/runtime/os_interface/linux/os_time_linux.h index 61e424d198..f795f4e855 100644 --- a/runtime/os_interface/linux/os_time_linux.h +++ b/runtime/os_interface/linux/os_time_linux.h @@ -14,7 +14,7 @@ #define TIMESTAMP_HIGH_REG 0x0235C #define TIMESTAMP_LOW_REG 0x02358 -namespace OCLRT { +namespace NEO { class OSTimeLinux : public OSTime { public: @@ -41,4 +41,4 @@ class OSTimeLinux : public OSTime { getTimeFunc_t getTimeFunc; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/performance_counters_linux.cpp b/runtime/os_interface/linux/performance_counters_linux.cpp index 7cb6a4f761..ac8da816c0 100644 --- a/runtime/os_interface/linux/performance_counters_linux.cpp +++ b/runtime/os_interface/linux/performance_counters_linux.cpp @@ -1,28 +1,13 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #include "performance_counters_linux.h" -namespace OCLRT { +namespace NEO { std::unique_ptr PerformanceCounters::create(OSTime *osTime) { return std::unique_ptr(new PerformanceCountersLinux(osTime)); @@ -84,4 +69,4 @@ bool PerformanceCountersLinux::getPerfmonConfig(InstrPmRegsCfg *pCfg) { } return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/linux/performance_counters_linux.h b/runtime/os_interface/linux/performance_counters_linux.h index c1d0d636e4..42b50da882 100644 --- a/runtime/os_interface/linux/performance_counters_linux.h +++ b/runtime/os_interface/linux/performance_counters_linux.h @@ -14,7 +14,7 @@ typedef struct _drm_intel_context drm_intel_context; -namespace OCLRT { +namespace NEO { class PerformanceCountersLinux : virtual public PerformanceCounters { public: @@ -39,4 +39,4 @@ class PerformanceCountersLinux : virtual public PerformanceCounters { decltype(&dlclose) dlcloseFunc = dlclose; decltype(&instrSetPlatformInfo) setPlatformInfoFunc = instrSetPlatformInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_context.h b/runtime/os_interface/os_context.h index a7d94ff07e..ec486188ab 100644 --- a/runtime/os_interface/os_context.h +++ b/runtime/os_interface/os_context.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { class OSInterface; class OsContext : public ReferenceTrackedObject { @@ -46,4 +46,4 @@ class OsContext : public ReferenceTrackedObject { EngineType engineType = EngineType::ENGINE_RCS; const bool lowPriority; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_interface.h b/runtime/os_interface/os_interface.h index 04bbe69d18..701f239297 100644 --- a/runtime/os_interface/os_interface.h +++ b/runtime/os_interface/os_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { class OSInterface { @@ -30,4 +30,4 @@ class OSInterface { protected: OSInterfaceImpl *osInterfaceImpl = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_library.h b/runtime/os_interface/os_library.h index 8d11add8f1..5d5d5918f7 100644 --- a/runtime/os_interface/os_library.h +++ b/runtime/os_interface/os_library.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct ConvertibleProcAddr { template @@ -39,4 +39,4 @@ class OsLibrary { virtual void *getProcAddress(const std::string &procName) = 0; virtual bool isLoaded() = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_thread.h b/runtime/os_interface/os_thread.h index b67dff6192..750bcf9460 100644 --- a/runtime/os_interface/os_thread.h +++ b/runtime/os_interface/os_thread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { class Thread { public: @@ -15,4 +15,4 @@ class Thread { virtual void join() = 0; virtual ~Thread() = default; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_time.cpp b/runtime/os_interface/os_time.cpp index 7b20f887f5..daab0028c5 100644 --- a/runtime/os_interface/os_time.cpp +++ b/runtime/os_interface/os_time.cpp @@ -9,9 +9,9 @@ #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { double OSTime::getDeviceTimerResolution(HardwareInfo const &hwInfo) { return hwInfo.capabilityTable.defaultProfilingTimerResolution; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/os_time.h b/runtime/os_interface/os_time.h index 97c5d7b120..a3dedb4c08 100644 --- a/runtime/os_interface/os_time.h +++ b/runtime/os_interface/os_time.h @@ -1,23 +1,8 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once @@ -25,7 +10,7 @@ #define NSEC_PER_SEC (1000000000ULL) -namespace OCLRT { +namespace NEO { class OSInterface; struct HardwareInfo; @@ -55,4 +40,4 @@ class OSTime { OSTime() {} OSInterface *osInterface = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/performance_counters.cpp b/runtime/os_interface/performance_counters.cpp index a1e1402611..746bd661b4 100644 --- a/runtime/os_interface/performance_counters.cpp +++ b/runtime/os_interface/performance_counters.cpp @@ -13,7 +13,7 @@ #include "CL/cl.h" -namespace OCLRT { +namespace NEO { decltype(&instrGetPerfCountersQueryData) getPerfCountersQueryDataFactory[IGFX_MAX_CORE] = { nullptr, }; @@ -178,4 +178,4 @@ int PerformanceCounters::sendPerfConfiguration(uint32_t count, uint32_t *pOffset uint32_t PerformanceCounters::getCurrentReportId() { return (osInterface->getHwContextId() << 12) | getReportId(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/performance_counters.h b/runtime/os_interface/performance_counters.h index 6231993308..35e1620a0b 100644 --- a/runtime/os_interface/performance_counters.h +++ b/runtime/os_interface/performance_counters.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; class OSInterface; class OSTime; @@ -74,4 +74,4 @@ class PerformanceCounters { decltype(&instrEscSetPmRegsCfg) setPmRegsCfgFunc = instrEscSetPmRegsCfg; decltype(&instrEscSendReadRegsCfg) sendReadRegsCfgFunc = instrEscSendReadRegsCfg; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/api_win.cpp b/runtime/os_interface/windows/api_win.cpp index 9e5ddfef5a..434bf7a510 100644 --- a/runtime/os_interface/windows/api_win.cpp +++ b/runtime/os_interface/windows/api_win.cpp @@ -18,9 +18,9 @@ #include "runtime/sharings/d3d/d3d_texture.h" #include "runtime/utilities/api_intercept.h" -using namespace OCLRT; +using namespace NEO; -void OCLRT::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { +void NEO::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { switch (paramName) { case CL_MEM_D3D10_RESOURCE_KHR: *srcParamSize = sizeof(ID3D10Resource *); @@ -49,7 +49,7 @@ void OCLRT::MemObj::getOsSpecificMemObjectInfo(const cl_mem_info ¶mName, siz } } -void OCLRT::Image::getOsSpecificImageInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { +void NEO::Image::getOsSpecificImageInfo(const cl_mem_info ¶mName, size_t *srcParamSize, void **srcParam) { switch (paramName) { case CL_IMAGE_D3D10_SUBRESOURCE_KHR: *srcParamSize = sizeof(unsigned int); @@ -67,7 +67,7 @@ void OCLRT::Image::getOsSpecificImageInfo(const cl_mem_info ¶mName, size_t * } } -void *OCLRT::Context::getOsContextInfo(cl_context_info ¶mName, size_t *srcParamSize) { +void *NEO::Context::getOsContextInfo(cl_context_info ¶mName, size_t *srcParamSize) { switch (paramName) { case CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR: case CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR: diff --git a/runtime/os_interface/windows/d3d10_11_sharing_functions.cpp b/runtime/os_interface/windows/d3d10_11_sharing_functions.cpp index 36a857b175..6bc706623e 100644 --- a/runtime/os_interface/windows/d3d10_11_sharing_functions.cpp +++ b/runtime/os_interface/windows/d3d10_11_sharing_functions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/windows/d3d_sharing_functions.h" #include "runtime/sharings/sharing_factory.h" -using namespace OCLRT; +using namespace NEO; template class D3DSharingFunctions; template class D3DSharingFunctions; diff --git a/runtime/os_interface/windows/d3d9_sharing_functions.cpp b/runtime/os_interface/windows/d3d9_sharing_functions.cpp index e595c7e8ef..9496eccc7b 100644 --- a/runtime/os_interface/windows/d3d9_sharing_functions.cpp +++ b/runtime/os_interface/windows/d3d9_sharing_functions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/os_interface/windows/d3d_sharing_functions.h" #include "runtime/sharings/sharing_factory.h" -using namespace OCLRT; +using namespace NEO; template class D3DSharingFunctions; const uint32_t D3DSharingFunctions::sharingId = SharingType::D3D9_SHARING; diff --git a/runtime/os_interface/windows/d3d_sharing_functions.h b/runtime/os_interface/windows/d3d_sharing_functions.h index 0aa19c422e..17a9a7d4cf 100644 --- a/runtime/os_interface/windows/d3d_sharing_functions.h +++ b/runtime/os_interface/windows/d3d_sharing_functions.h @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { namespace D3DTypesHelper { struct D3D9 { typedef IDirect3DDevice9 D3DDevice; @@ -179,4 +179,4 @@ static inline cl_int getSupportedDXTextureFormats(cl_context context, cl_mem_obj return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/debug_registry_reader.cpp b/runtime/os_interface/windows/debug_registry_reader.cpp index 9207f5923b..b3a1686a63 100644 --- a/runtime/os_interface/windows/debug_registry_reader.cpp +++ b/runtime/os_interface/windows/debug_registry_reader.cpp @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { SettingsReader *SettingsReader::createOsReader(bool userScope) { return new RegistryReader(userScope); @@ -126,4 +126,4 @@ std::string RegistryReader::getSetting(const char *settingName, const std::strin return keyValue; } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/os_interface/windows/deferrable_deletion_win.cpp b/runtime/os_interface/windows/deferrable_deletion_win.cpp index d144445a0e..0947ff5664 100644 --- a/runtime/os_interface/windows/deferrable_deletion_win.cpp +++ b/runtime/os_interface/windows/deferrable_deletion_win.cpp @@ -9,7 +9,7 @@ #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { template DeferrableDeletion *DeferrableDeletion::create(Args... args) { @@ -38,4 +38,4 @@ DeferrableDeletionImpl::~DeferrableDeletionImpl() { delete[] handles; } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/deferrable_deletion_win.h b/runtime/os_interface/windows/deferrable_deletion_win.h index f318dfe4d8..49e781f613 100644 --- a/runtime/os_interface/windows/deferrable_deletion_win.h +++ b/runtime/os_interface/windows/deferrable_deletion_win.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { class OsContextWin; class Wddm; @@ -32,4 +32,4 @@ class DeferrableDeletionImpl : public DeferrableDeletion { uint32_t allocationCount; D3DKMT_HANDLE resourceHandle; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/device_command_stream.inl b/runtime/os_interface/windows/device_command_stream.inl index e00b3d4143..aedc236338 100644 --- a/runtime/os_interface/windows/device_command_stream.inl +++ b/runtime/os_interface/windows/device_command_stream.inl @@ -16,7 +16,7 @@ #include "hw_cmds.h" #pragma warning(pop) -namespace OCLRT { +namespace NEO { template CommandStreamReceiver *DeviceCommandStreamReceiver::create(bool withAubDump, ExecutionEnvironment &executionEnvironment) { @@ -26,4 +26,4 @@ CommandStreamReceiver *DeviceCommandStreamReceiver::create(bool withA return new WddmCommandStreamReceiver(executionEnvironment); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/device_factory_win.cpp b/runtime/os_interface/windows/device_factory_win.cpp index d8b46107e4..5a00d52df3 100644 --- a/runtime/os_interface/windows/device_factory_win.cpp +++ b/runtime/os_interface/windows/device_factory_win.cpp @@ -16,7 +16,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { extern const HardwareInfo *hardwareInfoTable[IGFX_MAX_PRODUCT]; @@ -83,6 +83,6 @@ void Device::appendOSExtensions(std::string &deviceExtensions) { CL_CONTEXT_D3D11_DEVICE_KHR, 0}; } -} // namespace OCLRT +} // namespace NEO #endif diff --git a/runtime/os_interface/windows/driver_info.cpp b/runtime/os_interface/windows/driver_info.cpp index e200128db6..2d0998df94 100644 --- a/runtime/os_interface/windows/driver_info.cpp +++ b/runtime/os_interface/windows/driver_info.cpp @@ -12,7 +12,7 @@ #include "runtime/os_interface/windows/registry_reader.h" #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { DriverInfo *DriverInfo::create(OSInterface *osInterface) { if (osInterface) { @@ -51,4 +51,4 @@ std::string DriverInfoWindows::getDeviceName(std::string defaultName) { std::string DriverInfoWindows::getVersion(std::string defaultVersion) { return registryReader.get()->getSetting("DriverVersion", defaultVersion); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/driver_info.h b/runtime/os_interface/windows/driver_info.h index 4d8c9547ce..b246e317da 100644 --- a/runtime/os_interface/windows/driver_info.h +++ b/runtime/os_interface/windows/driver_info.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class SettingsReader; @@ -28,4 +28,4 @@ class DriverInfoWindows : public DriverInfo { std::unique_ptr registryReader; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/gdi_interface.cpp b/runtime/os_interface/windows/gdi_interface.cpp index 789f09bc66..2a6a7a2e17 100644 --- a/runtime/os_interface/windows/gdi_interface.cpp +++ b/runtime/os_interface/windows/gdi_interface.cpp @@ -7,7 +7,7 @@ #include "gdi_interface.h" -namespace OCLRT { +namespace NEO { inline const std::string getGdiName() { if (DebugManager.flags.OverrideGdiPath.get() != "unk") { @@ -99,4 +99,4 @@ bool Gdi::getAllProcAddresses() { // clang-format on return false; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/gdi_interface.h b/runtime/os_interface/windows/gdi_interface.h index b3a2c852da..88c6b9b18d 100644 --- a/runtime/os_interface/windows/gdi_interface.h +++ b/runtime/os_interface/windows/gdi_interface.h @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { class Gdi { public: @@ -83,6 +83,6 @@ class Gdi { protected: MOCKABLE_VIRTUAL bool getAllProcAddresses(); bool initialized; - OCLRT::Windows::OsLibrary gdiDll; + NEO::Windows::OsLibrary gdiDll; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp index 0aa8b87a34..98cfad9f46 100644 --- a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp +++ b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { void destroySync(Gdi &gdi, D3DKMT_HANDLE sync) { if (!sync) { @@ -150,4 +150,4 @@ void serverWaitForArbSyncObject(OSInterface &osInterface, CL_GL_SYNC_INFO &glSyn } glSyncInfo.waitCalled = true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/gl/gl_sharing_win.cpp b/runtime/os_interface/windows/gl/gl_sharing_win.cpp index a9c3e0b969..25f1a491f8 100644 --- a/runtime/os_interface/windows/gl/gl_sharing_win.cpp +++ b/runtime/os_interface/windows/gl/gl_sharing_win.cpp @@ -17,7 +17,7 @@ namespace Os { extern const char *openglDllName; } -namespace OCLRT { +namespace NEO { GLboolean GLSharingFunctions::makeCurrent(GLContext contextHandle, GLDisplay displayHandle) { if (displayHandle == 0) { @@ -133,4 +133,4 @@ void GLSharingFunctions::createBackupContext() { pfnWglShareLists(GLHGLRCHandle, GLHGLRCHandleBkpCtx); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/hw_info_config.cpp b/runtime/os_interface/windows/hw_info_config.cpp index 7efbbef310..b9b57512f1 100644 --- a/runtime/os_interface/windows/hw_info_config.cpp +++ b/runtime/os_interface/windows/hw_info_config.cpp @@ -16,7 +16,7 @@ #include "instrumentation.h" -namespace OCLRT { +namespace NEO { HwInfoConfig *hwInfoConfigFactory[IGFX_MAX_PRODUCT] = {}; @@ -58,4 +58,4 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou return ret; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/kmdaf_listener.cpp b/runtime/os_interface/windows/kmdaf_listener.cpp index 0a9c3266c1..f90bccf6fc 100644 --- a/runtime/os_interface/windows/kmdaf_listener.cpp +++ b/runtime/os_interface/windows/kmdaf_listener.cpp @@ -11,7 +11,7 @@ #include "kmdaf.h" #pragma warning(pop) // restore state. -namespace OCLRT { +namespace NEO { void KmDafListener::notifyLock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DDDICB_LOCKFLAGS *pLockFlags, PFND3DKMT_ESCAPE pfnEscape) { KM_DAF_NOTIFY_LOCK(ftrKmdDaf, hAdapter, hDevice, hAllocation, pLockFlags, pfnEscape); @@ -40,4 +40,4 @@ void KmDafListener::notifyEvict(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_H void KmDafListener::notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape) { KM_DAF_NOTIFY_WRITE_TARGET(ftrKmdDaf, hAdapter, hDevice, hAllocation, pfnEscape); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/kmdaf_listener.h b/runtime/os_interface/windows/kmdaf_listener.h index 97d16727cd..68562ecf72 100644 --- a/runtime/os_interface/windows/kmdaf_listener.h +++ b/runtime/os_interface/windows/kmdaf_listener.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct KmDafListener { @@ -28,4 +28,4 @@ struct KmDafListener { MOCKABLE_VIRTUAL void notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/kmdaf_listener_stub.cpp b/runtime/os_interface/windows/kmdaf_listener_stub.cpp index 5f60f3e574..22d02fe588 100644 --- a/runtime/os_interface/windows/kmdaf_listener_stub.cpp +++ b/runtime/os_interface/windows/kmdaf_listener_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/os_interface/windows/kmdaf_listener.h" -namespace OCLRT { +namespace NEO { void KmDafListener::notifyLock(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, D3DDDICB_LOCKFLAGS *pLockFlags, PFND3DKMT_ESCAPE pfnEscape) { } @@ -29,4 +29,4 @@ void KmDafListener::notifyEvict(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_H void KmDafListener::notifyWriteTarget(bool ftrKmdDaf, D3DKMT_HANDLE hAdapter, D3DKMT_HANDLE hDevice, const D3DKMT_HANDLE hAllocation, PFND3DKMT_ESCAPE pfnEscape) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_context_win.cpp b/runtime/os_interface/windows/os_context_win.cpp index 3bd03e81b4..60c69d401f 100644 --- a/runtime/os_interface/windows/os_context_win.cpp +++ b/runtime/os_interface/windows/os_context_win.cpp @@ -11,7 +11,7 @@ #include "runtime/os_interface/windows/wddm/wddm.h" #include "runtime/os_interface/windows/wddm/wddm_interface.h" -namespace OCLRT { +namespace NEO { OsContext *OsContext::create(OSInterface *osInterface, uint32_t contextId, DeviceBitfield deviceBitfield, EngineType engineType, PreemptionMode preemptionMode, bool lowPriority) { @@ -45,4 +45,4 @@ OsContextWin::~OsContextWin() { wddm.destroyContext(wddmContextHandle); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_context_win.h b/runtime/os_interface/windows/os_context_win.h index 2350013307..a84368772b 100644 --- a/runtime/os_interface/windows/os_context_win.h +++ b/runtime/os_interface/windows/os_context_win.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/windows/wddm_residency_controller.h" -namespace OCLRT { +namespace NEO { class Wddm; class OsContextWin : public OsContext { @@ -35,4 +35,4 @@ class OsContextWin : public OsContext { Wddm &wddm; WddmResidencyController residencyController; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_interface.cpp b/runtime/os_interface/windows/os_interface.cpp index a0bff63868..b529c4f1b6 100644 --- a/runtime/os_interface/windows/os_interface.cpp +++ b/runtime/os_interface/windows/os_interface.cpp @@ -10,7 +10,7 @@ #include "runtime/os_interface/windows/sys_calls.h" #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { bool OSInterface::osEnabled64kbPages = true; @@ -71,4 +71,4 @@ HANDLE OSInterface::OSInterfaceImpl::createEvent(LPSECURITY_ATTRIBUTES lpEventAt BOOL OSInterface::OSInterfaceImpl::closeHandle(HANDLE hObject) { return SysCalls::closeHandle(hObject); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_interface.h b/runtime/os_interface/windows/os_interface.h index 1baca8f48a..8071a24999 100644 --- a/runtime/os_interface/windows/os_interface.h +++ b/runtime/os_interface/windows/os_interface.h @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { class Wddm; class OSInterface::OSInterfaceImpl { @@ -37,4 +37,4 @@ class OSInterface::OSInterfaceImpl { protected: std::unique_ptr wddm; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_library.cpp b/runtime/os_interface/windows/os_library.cpp index 1600464ef1..0a1bdd3e86 100644 --- a/runtime/os_interface/windows/os_library.cpp +++ b/runtime/os_interface/windows/os_library.cpp @@ -9,7 +9,7 @@ #include "os_library.h" -namespace OCLRT { +namespace NEO { OsLibrary *OsLibrary::load(const std::string &name) { Windows::OsLibrary *ptr = new Windows::OsLibrary(name); @@ -68,4 +68,4 @@ void *OsLibrary::getProcAddress(const std::string &procName) { return ::GetProcAddress(this->handle, procName.c_str()); } } // namespace Windows -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_library.h b/runtime/os_interface/windows/os_library.h index 3162b5fffa..8ef3432baf 100644 --- a/runtime/os_interface/windows/os_library.h +++ b/runtime/os_interface/windows/os_library.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,10 +11,10 @@ #define UMDF_USING_NTSTATUS #include "runtime/os_interface/windows/windows_wrapper.h" -namespace OCLRT { +namespace NEO { namespace Windows { -class OsLibrary : public OCLRT::OsLibrary { +class OsLibrary : public NEO::OsLibrary { private: HMODULE handle; @@ -32,4 +32,4 @@ class OsLibrary : public OCLRT::OsLibrary { static decltype(&GetModuleFileNameA) getModuleFileNameA; }; } // namespace Windows -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_thread_win.cpp b/runtime/os_interface/windows/os_thread_win.cpp index a3d066a627..80326fe97d 100644 --- a/runtime/os_interface/windows/os_thread_win.cpp +++ b/runtime/os_interface/windows/os_thread_win.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "runtime/os_interface/windows/os_thread_win.h" -namespace OCLRT { +namespace NEO { ThreadWin::ThreadWin(std::thread *thread) { this->thread.reset(thread); }; @@ -18,4 +18,4 @@ std::unique_ptr Thread::create(void *(*func)(void *), void *arg) { void ThreadWin::join() { thread->join(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_thread_win.h b/runtime/os_interface/windows/os_thread_win.h index 533f843745..f2d1e5ee9a 100644 --- a/runtime/os_interface/windows/os_thread_win.h +++ b/runtime/os_interface/windows/os_thread_win.h @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { class ThreadWin : public Thread { public: ThreadWin(std::thread *thread); @@ -18,4 +18,4 @@ class ThreadWin : public Thread { protected: std::unique_ptr thread; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_time_win.cpp b/runtime/os_interface/windows/os_time_win.cpp index 4170a95566..b446881210 100644 --- a/runtime/os_interface/windows/os_time_win.cpp +++ b/runtime/os_interface/windows/os_time_win.cpp @@ -14,7 +14,7 @@ #undef WIN32_NO_STATUS -namespace OCLRT { +namespace NEO { bool runEscape(Wddm *wddm, TimeStampDataHeader &escapeInfo) { if (wddm) { @@ -109,4 +109,4 @@ uint64_t OSTimeWin::getCpuRawTimestamp() { this->QueryPerfomanceCounterFnc(&cpuRawTimestamp); return cpuRawTimestamp.QuadPart; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/os_time_win.h b/runtime/os_interface/windows/os_time_win.h index be95385dd1..61cb5c8a0e 100644 --- a/runtime/os_interface/windows/os_time_win.h +++ b/runtime/os_interface/windows/os_time_win.h @@ -11,7 +11,7 @@ #include "gfxEscape.h" -namespace OCLRT { +namespace NEO { class Wddm; class OSTimeWin : public OSTime { @@ -72,4 +72,4 @@ struct TimeStampDataHeader { } m_Data; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/performance_counters_win.cpp b/runtime/os_interface/windows/performance_counters_win.cpp index 3f73a0c344..f8382f3327 100644 --- a/runtime/os_interface/windows/performance_counters_win.cpp +++ b/runtime/os_interface/windows/performance_counters_win.cpp @@ -10,7 +10,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/windows_wrapper.h" -namespace OCLRT { +namespace NEO { std::unique_ptr PerformanceCounters::create(OSTime *osTime) { return std::unique_ptr(new PerformanceCountersWin(osTime)); } @@ -34,4 +34,4 @@ void PerformanceCountersWin::initialize(const HardwareInfo *hwInfo) { verifyEnableFunc(cbData); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/performance_counters_win.h b/runtime/os_interface/windows/performance_counters_win.h index 036cf47c8d..e6ee2d92c3 100644 --- a/runtime/os_interface/windows/performance_counters_win.h +++ b/runtime/os_interface/windows/performance_counters_win.h @@ -1,30 +1,15 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #pragma once #include "runtime/os_interface/performance_counters.h" #include "runtime/os_interface/windows/os_interface.h" -namespace OCLRT { +namespace NEO { class PerformanceCountersWin : virtual public PerformanceCounters { public: @@ -36,4 +21,4 @@ class PerformanceCountersWin : virtual public PerformanceCounters { decltype(&instrSetAvailable) setAvailableFunc = instrSetAvailable; decltype(&instrEscVerifyEnable) verifyEnableFunc = instrEscVerifyEnable; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/registry_reader.h b/runtime/os_interface/windows/registry_reader.h index 56c54c5151..95bcd8126d 100644 --- a/runtime/os_interface/windows/registry_reader.h +++ b/runtime/os_interface/windows/registry_reader.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class RegistryReader : public SettingsReader { public: int32_t getSetting(const char *settingName, int32_t defaultValue) override; @@ -31,4 +31,4 @@ class RegistryReader : public SettingsReader { void setUpProcessName(); std::string processName; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/sys_calls.cpp b/runtime/os_interface/windows/sys_calls.cpp index d3ebf0e5aa..2256c6271c 100644 --- a/runtime/os_interface/windows/sys_calls.cpp +++ b/runtime/os_interface/windows/sys_calls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "sys_calls.h" -namespace OCLRT { +namespace NEO { namespace SysCalls { @@ -25,4 +25,4 @@ BOOL getSystemPowerStatus(LPSYSTEM_POWER_STATUS systemPowerStatusPtr) { } // namespace SysCalls -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/sys_calls.h b/runtime/os_interface/windows/sys_calls.h index 8d5ffc9144..4a5c721ff0 100644 --- a/runtime/os_interface/windows/sys_calls.h +++ b/runtime/os_interface/windows/sys_calls.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { namespace SysCalls { @@ -18,4 +18,4 @@ BOOL getSystemPowerStatus(LPSYSTEM_POWER_STATUS systemPowerStatusPtr); } // namespace SysCalls -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/thk_wrapper.h b/runtime/os_interface/windows/thk_wrapper.h index 5e82248b88..9023c18cea 100644 --- a/runtime/os_interface/windows/thk_wrapper.h +++ b/runtime/os_interface/windows/thk_wrapper.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { // IDs for easy system times identification enum SystemCallsIds { SYSTIMER_ID_OPENADAPTERFROMHDC = 1, @@ -165,4 +165,4 @@ class ThkWrapper { GET_ID(CONST D3DKMT_DESTROYHWQUEUE *, SYSTIMER_ID_DESTROYHWQUEUE) GET_ID(CONST D3DKMT_SUBMITCOMMANDTOHWQUEUE *, SYSTIMER_ID_SUBMITCOMMANDTOHWQUEUE) }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 87065c01e8..7429a2d9e5 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -25,7 +25,7 @@ #include "gmm_memory.h" -namespace OCLRT { +namespace NEO { extern Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory(); extern Wddm::GetSystemInfoFcn getGetSystemInfo(); extern Wddm::VirtualAllocFcn getVirtualAlloc(); @@ -992,4 +992,4 @@ std::unique_lock Wddm::acquireLock(SpinLock &lock) { return std::unique_lock{lock}; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm/wddm.h b/runtime/os_interface/windows/wddm/wddm.h index bc6d4d762c..1fe071043e 100644 --- a/runtime/os_interface/windows/wddm/wddm.h +++ b/runtime/os_interface/windows/wddm/wddm.h @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Gdi; class Gmm; class GmmMemory; @@ -206,4 +206,4 @@ class Wddm { std::vector temporaryResources; SpinLock temporaryResourcesLock; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm/wddm_calls.cpp b/runtime/os_interface/windows/wddm/wddm_calls.cpp index 427678c632..51abcbe308 100644 --- a/runtime/os_interface/windows/wddm/wddm_calls.cpp +++ b/runtime/os_interface/windows/wddm/wddm_calls.cpp @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory() { return CreateDXGIFactory; } @@ -26,4 +26,4 @@ Wddm::VirtualFreeFcn getVirtualFree() { Wddm::VirtualAllocFcn getVirtualAlloc() { return VirtualAlloc; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm/wddm_create.cpp b/runtime/os_interface/windows/wddm/wddm_create.cpp index 1ea901298a..cf3485650c 100644 --- a/runtime/os_interface/windows/wddm/wddm_create.cpp +++ b/runtime/os_interface/windows/wddm/wddm_create.cpp @@ -7,8 +7,8 @@ #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { Wddm *Wddm::createWddm() { return new Wddm(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm/wddm_interface.cpp b/runtime/os_interface/windows/wddm/wddm_interface.cpp index 64eaa97125..868649873b 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.cpp +++ b/runtime/os_interface/windows/wddm/wddm_interface.cpp @@ -12,7 +12,7 @@ #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/wddm/wddm.h" -using namespace OCLRT; +using namespace NEO; bool WddmInterface20::createHwQueue(OsContextWin &osContext) { return false; diff --git a/runtime/os_interface/windows/wddm/wddm_interface.h b/runtime/os_interface/windows/wddm/wddm_interface.h index 2e8ce20391..d3c9df93fa 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.h +++ b/runtime/os_interface/windows/wddm/wddm_interface.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { class Gdi; class Wddm; class OsContextWin; @@ -50,4 +50,4 @@ class WddmInterface23 : public WddmInterface { const bool hwQueuesSupported() override; bool submit(uint64_t commandBuffer, size_t size, void *commandHeader, OsContextWin &osContext) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_32bit_memory.cpp b/runtime/os_interface/windows/wddm_32bit_memory.cpp index d0dd515831..7776a09c49 100644 --- a/runtime/os_interface/windows/wddm_32bit_memory.cpp +++ b/runtime/os_interface/windows/wddm_32bit_memory.cpp @@ -7,9 +7,9 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/os_interface/32bit_memory.h" -using namespace OCLRT; +using namespace NEO; -bool OCLRT::is32BitOsAllocatorAvailable = is64bit; +bool NEO::is32BitOsAllocatorAvailable = is64bit; class Allocator32bit::OsInternals { public: @@ -20,7 +20,7 @@ Allocator32bit::Allocator32bit(uint64_t base, uint64_t size) : base(base), size( heapAllocator = std::make_unique(base, size); } -OCLRT::Allocator32bit::Allocator32bit() { +NEO::Allocator32bit::Allocator32bit() { size_t sizeToMap = 100 * 4096; this->base = (uint64_t)alignedMalloc(sizeToMap, 4096); osInternals = std::make_unique(); @@ -29,7 +29,7 @@ OCLRT::Allocator32bit::Allocator32bit() { heapAllocator = std::make_unique(this->base, sizeToMap); } -OCLRT::Allocator32bit::~Allocator32bit() { +NEO::Allocator32bit::~Allocator32bit() { if (this->osInternals.get() != nullptr) { alignedFree(this->osInternals->allocatedRange); } diff --git a/runtime/os_interface/windows/wddm_additional_context_flags.cpp b/runtime/os_interface/windows/wddm_additional_context_flags.cpp index 22e063eb68..5ca78588dc 100644 --- a/runtime/os_interface/windows/wddm_additional_context_flags.cpp +++ b/runtime/os_interface/windows/wddm_additional_context_flags.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/windows/wddm/wddm.h" -namespace OCLRT { +namespace NEO { void Wddm::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) { } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_allocation.cpp b/runtime/os_interface/windows/wddm_allocation.cpp index 0e760d56a2..4310ca9d7a 100644 --- a/runtime/os_interface/windows/wddm_allocation.cpp +++ b/runtime/os_interface/windows/wddm_allocation.cpp @@ -7,8 +7,8 @@ #include "runtime/os_interface/windows/wddm_allocation.h" -namespace OCLRT { +namespace NEO { std::string WddmAllocation::getAllocationInfoString() const { return getHandleInfoString(); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/os_interface/windows/wddm_allocation.h b/runtime/os_interface/windows/wddm_allocation.h index 960f321795..a19d2879e0 100644 --- a/runtime/os_interface/windows/wddm_allocation.h +++ b/runtime/os_interface/windows/wddm_allocation.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { struct OsHandle { D3DKMT_HANDLE handle; @@ -89,4 +89,4 @@ class WddmAllocation : public GraphicsAllocation { ResidencyData residency; std::array trimCandidateListPositions; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_device_command_stream.h b/runtime/os_interface/windows/wddm_device_command_stream.h index 9a7ccbd8f9..19d09773d7 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.h +++ b/runtime/os_interface/windows/wddm_device_command_stream.h @@ -10,7 +10,7 @@ struct COMMAND_BUFFER_HEADER_REC; -namespace OCLRT { +namespace NEO { class GmmPageTableMngr; class GraphicsAllocation; class WddmMemoryManager; @@ -44,4 +44,4 @@ class WddmCommandStreamReceiver : public DeviceCommandStreamReceiver COMMAND_BUFFER_HEADER_REC *commandBufferHeader; bool pageTableManagerInitialized = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index 0444ba5a22..1df4b55170 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -26,7 +26,7 @@ #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" -namespace OCLRT { +namespace NEO { // Initialize COMMAND_BUFFER_HEADER Type PatchList Streamer Perf Tag DECLARE_COMMAND_BUFFER(CommandBufferHeader, UMD_OCL, FALSE, FALSE, PERFTAG_OCL); @@ -193,4 +193,4 @@ void WddmCommandStreamReceiver::kmDafLockAllocations(ResidencyContain } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_engine_mapper.cpp b/runtime/os_interface/windows/wddm_engine_mapper.cpp index b93fd48717..2cd0553136 100644 --- a/runtime/os_interface/windows/wddm_engine_mapper.cpp +++ b/runtime/os_interface/windows/wddm_engine_mapper.cpp @@ -9,7 +9,7 @@ #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { GPUNODE_ORDINAL WddmEngineMapper::engineNodeMap(EngineType engineType) { if (EngineType::ENGINE_RCS == engineType) { @@ -18,4 +18,4 @@ GPUNODE_ORDINAL WddmEngineMapper::engineNodeMap(EngineType engineType) { UNRECOVERABLE_IF(true); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_engine_mapper.h b/runtime/os_interface/windows/wddm_engine_mapper.h index 82432e6cce..5b037bd955 100644 --- a/runtime/os_interface/windows/wddm_engine_mapper.h +++ b/runtime/os_interface/windows/wddm_engine_mapper.h @@ -11,11 +11,11 @@ #include "engine_node.h" -namespace OCLRT { +namespace NEO { class WddmEngineMapper { public: static GPUNODE_ORDINAL engineNodeMap(EngineType engineType); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index ec318ebde1..25a5175f8d 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -29,7 +29,7 @@ #include -namespace OCLRT { +namespace NEO { WddmMemoryManager::~WddmMemoryManager() { applyCommonCleanup(); @@ -572,4 +572,4 @@ void WddmMemoryManager::releaseReservedCpuAddressRange(void *reserved, size_t si wddm->releaseReservedAddress(reserved); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_memory_manager.h b/runtime/os_interface/windows/wddm_memory_manager.h index 9996ab498d..8431adf5ae 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.h +++ b/runtime/os_interface/windows/wddm_memory_manager.h @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Gmm; class OsContextWin; class Wddm; @@ -89,4 +89,4 @@ class WddmMemoryManager : public MemoryManager { private: Wddm *wddm; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp b/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp index 22fe2b3487..fbf01e034e 100644 --- a/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp @@ -7,11 +7,11 @@ #include "runtime/os_interface/windows/wddm_memory_manager.h" -namespace OCLRT { +namespace NEO { GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { return MemoryManager::allocateGraphicsMemoryInDevicePool(allocationData, status); } bool WddmMemoryManager::copyMemoryToAllocation(GraphicsAllocation *graphicsAllocation, const void *memoryToCopy, uint32_t sizeToCopy) const { return MemoryManager::copyMemoryToAllocation(graphicsAllocation, memoryToCopy, sizeToCopy); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_residency_controller.cpp b/runtime/os_interface/windows/wddm_residency_controller.cpp index dc337260ec..72704a6662 100644 --- a/runtime/os_interface/windows/wddm_residency_controller.cpp +++ b/runtime/os_interface/windows/wddm_residency_controller.cpp @@ -13,7 +13,7 @@ #include "runtime/os_interface/windows/wddm_memory_manager.h" #include "runtime/utilities/spinlock.h" -namespace OCLRT { +namespace NEO { WddmResidencyController::WddmResidencyController(Wddm &wddm, uint32_t osContextId) : wddm(wddm), osContextId(osContextId) { } @@ -382,4 +382,4 @@ void WddmResidencyController::makeNonResidentEvictionAllocations(ResidencyContai } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/wddm_residency_controller.h b/runtime/os_interface/windows/wddm_residency_controller.h index d88b2fa71d..f7e24ef02a 100644 --- a/runtime/os_interface/windows/wddm_residency_controller.h +++ b/runtime/os_interface/windows/wddm_residency_controller.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; class WddmAllocation; @@ -74,4 +74,4 @@ class WddmResidencyController { VOID *trimCallbackHandle = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/os_interface/windows/windows_defs.h b/runtime/os_interface/windows/windows_defs.h index c2adb1c062..a7139ac6b3 100644 --- a/runtime/os_interface/windows/windows_defs.h +++ b/runtime/os_interface/windows/windows_defs.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { constexpr uintptr_t windowsMinAddress = 0x200000; @@ -24,4 +24,4 @@ struct MonitoredFence { uint64_t lastSubmittedFence = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/platform/extensions.cpp b/runtime/platform/extensions.cpp index 033864810e..e48d14c219 100644 --- a/runtime/platform/extensions.cpp +++ b/runtime/platform/extensions.cpp @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { const char *deviceExtensionsList = "cl_khr_3d_image_writes " "cl_khr_byte_addressable_store " @@ -78,4 +78,4 @@ std::string convertEnabledExtensionsToCompilerInternalOptions(const char *enable return extensionsList; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/platform/extensions.h b/runtime/platform/extensions.h index 853c3a7072..e4a123b7a6 100644 --- a/runtime/platform/extensions.h +++ b/runtime/platform/extensions.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { extern const char *deviceExtensionsList; @@ -19,4 +19,4 @@ std::string getExtensionsList(const HardwareInfo &hwInfo); std::string removeLastSpace(std::string &s); std::string convertEnabledExtensionsToCompilerInternalOptions(const char *deviceExtensions); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/platform/platform.cpp b/runtime/platform/platform.cpp index 93fd6c1472..b53c7ccd77 100644 --- a/runtime/platform/platform.cpp +++ b/runtime/platform/platform.cpp @@ -30,7 +30,7 @@ #include "CL/cl_ext.h" -namespace OCLRT { +namespace NEO { std::unique_ptr platformImpl; @@ -135,7 +135,7 @@ bool Platform::initialize() { this->initializationLoopHelper(); } - state = OCLRT::getDevices(&hwInfo, numDevicesReturned, *executionEnvironment) ? StateIniting : StateNone; + state = NEO::getDevices(&hwInfo, numDevicesReturned, *executionEnvironment) ? StateIniting : StateNone; if (state == StateNone) { return false; @@ -148,7 +148,7 @@ bool Platform::initialize() { this->devices.resize(numDevicesReturned); for (uint32_t deviceOrdinal = 0; deviceOrdinal < numDevicesReturned; ++deviceOrdinal) { - auto pDevice = Device::create(hwInfo, executionEnvironment, deviceOrdinal); + auto pDevice = Device::create(hwInfo, executionEnvironment, deviceOrdinal); DEBUG_BREAK_IF(!pDevice); if (pDevice) { this->devices[deviceOrdinal] = pDevice; @@ -249,4 +249,4 @@ std::unique_ptr Platform::setAsyncEventsHandler(std::unique_ return handler; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/platform/platform.h b/runtime/platform/platform.h index 0ce5ba670d..56a2694c4c 100644 --- a/runtime/platform/platform.h +++ b/runtime/platform/platform.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class CompilerInterface; class Device; @@ -76,4 +76,4 @@ class Platform : public BaseObject<_cl_platform_id> { extern std::unique_ptr platformImpl; Platform *platform(); Platform *constructPlatform(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/additional_options.cpp b/runtime/program/additional_options.cpp index 2116799dc1..812dff27fe 100644 --- a/runtime/program/additional_options.cpp +++ b/runtime/program/additional_options.cpp @@ -7,7 +7,7 @@ #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { void Program::applyAdditionalOptions() { } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/program/block_kernel_manager.cpp b/runtime/program/block_kernel_manager.cpp index 870730bdc1..bd246b5075 100644 --- a/runtime/program/block_kernel_manager.cpp +++ b/runtime/program/block_kernel_manager.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/debug_helpers.h" #include "runtime/program/kernel_info.h" -namespace OCLRT { +namespace NEO { void BlockKernelManager::addBlockKernelInfo(KernelInfo *blockKernelInfo) { blockKernelInfoArray.push_back(blockKernelInfo); @@ -61,4 +61,4 @@ void BlockKernelManager::makeInternalAllocationsResident(CommandStreamReceiver & } } } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/program/block_kernel_manager.h b/runtime/program/block_kernel_manager.h index e268cb9769..8ad5f5fec4 100644 --- a/runtime/program/block_kernel_manager.h +++ b/runtime/program/block_kernel_manager.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; class CommandStreamReceiver; struct KernelInfo; @@ -38,4 +38,4 @@ class BlockKernelManager { std::vector blockKernelInfoArray; std::vector blockPrivateSurfaceArray; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/program/build.cpp b/runtime/program/build.cpp index 31f0fb3987..b10df8fa9d 100644 --- a/runtime/program/build.cpp +++ b/runtime/program/build.cpp @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { cl_int Program::build( cl_uint numDevices, @@ -194,4 +194,4 @@ void Program::extractInternalOptions(std::string &options) { } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/compile.cpp b/runtime/program/compile.cpp index 205449d569..39c34765f5 100644 --- a/runtime/program/compile.cpp +++ b/runtime/program/compile.cpp @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { cl_int Program::compile( cl_uint numDevices, @@ -173,4 +173,4 @@ cl_int Program::compile( return retVal; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/create.cpp b/runtime/program/create.cpp index 766c645d81..fd7c45e1a2 100644 --- a/runtime/program/create.cpp +++ b/runtime/program/create.cpp @@ -9,10 +9,10 @@ #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { template Program *Program::create(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int &); template Program *Program::create(cl_context, cl_uint, const char **, const size_t *, cl_int &); template Program *Program::create(const char *, Context *, Device &, bool, cl_int *); template Program *Program::createFromIL(Context *, const void *, size_t length, cl_int &); template Program *Program::createFromGenBinary(ExecutionEnvironment &executionEnvironment, Context *context, const void *binary, size_t size, bool isBuiltIn, cl_int *errcodeRet); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/create.inl b/runtime/program/create.inl index bb84bcd595..3efaa4567b 100644 --- a/runtime/program/create.inl +++ b/runtime/program/create.inl @@ -9,7 +9,7 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { template T *Program::create( @@ -166,4 +166,4 @@ T *Program::createFromIL(Context *ctx, return program; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/evaluate_unhandled_token.cpp b/runtime/program/evaluate_unhandled_token.cpp index b112c6a2a3..5f671981a7 100644 --- a/runtime/program/evaluate_unhandled_token.cpp +++ b/runtime/program/evaluate_unhandled_token.cpp @@ -1,31 +1,16 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { bool Program::isSafeToSkipUnhandledToken(unsigned int token) const { return false; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/get_info.cpp b/runtime/program/get_info.cpp index ff61535b9a..af2ee5f678 100644 --- a/runtime/program/get_info.cpp +++ b/runtime/program/get_info.cpp @@ -13,7 +13,7 @@ #include "program.h" -namespace OCLRT { +namespace NEO { cl_int Program::getInfo(cl_program_info paramName, size_t paramValueSize, void *paramValue, size_t *paramValueSizeRet) { @@ -215,4 +215,4 @@ cl_int Program::getBuildInfo(cl_device_id device, cl_program_build_info paramNam return retVal; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/heap_info.h b/runtime/program/heap_info.h index 61b0af2f56..68352927f7 100644 --- a/runtime/program/heap_info.h +++ b/runtime/program/heap_info.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct HeapInfo { const SKernelBinaryHeaderCommon *pKernelHeader; @@ -34,4 +34,4 @@ struct HeapInfo { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/internal_options.cpp b/runtime/program/internal_options.cpp index 80b800b98d..a312186e25 100644 --- a/runtime/program/internal_options.cpp +++ b/runtime/program/internal_options.cpp @@ -9,6 +9,6 @@ #include -namespace OCLRT { +namespace NEO { const std::vector Program::internalOptionsToExtract = {"-cl-intel-gtpin-rera"}; }; diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index 6e2e785e45..ae7a578edd 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -24,7 +24,7 @@ #include #include -namespace OCLRT { +namespace NEO { const uint32_t WorkloadInfo::undefinedOffset = (uint32_t)-1; const uint32_t WorkloadInfo::invalidParentEvent = (uint32_t)-1; @@ -494,4 +494,4 @@ bool KernelInfo::createKernelAllocation(MemoryManager *memoryManager) { return memoryManager->copyMemoryToAllocation(kernelAllocation, heapInfo.pKernelHeap, kernelIsaSize); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/kernel_info.h b/runtime/program/kernel_info.h index 6b3460939c..ec7ca3a01c 100644 --- a/runtime/program/kernel_info.h +++ b/runtime/program/kernel_info.h @@ -23,7 +23,7 @@ #include #include -namespace OCLRT { +namespace NEO { class BuiltinDispatchInfoBuilder; class Device; class Kernel; @@ -244,4 +244,4 @@ struct KernelInfo { bool computeMode = false; const gtpin::igc_info_t *igcInfoForGtpin = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/link.cpp b/runtime/program/link.cpp index 7639375619..79bc1be595 100644 --- a/runtime/program/link.cpp +++ b/runtime/program/link.cpp @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { cl_int Program::link( cl_uint numDevices, @@ -162,4 +162,4 @@ cl_int Program::link( return retVal; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/patch_info.h b/runtime/program/patch_info.h index cfa3c5c73a..a36372834e 100644 --- a/runtime/program/patch_info.h +++ b/runtime/program/patch_info.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { using iOpenCL::SKernelBinaryHeaderCommon; using iOpenCL::SPatchAllocateLocalSurface; using iOpenCL::SPatchAllocateStatelessConstantMemorySurfaceWithInitialization; @@ -81,4 +81,4 @@ struct PatchInfo { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/print_formatter.cpp b/runtime/program/print_formatter.cpp index 0dea5b7084..893d88a619 100644 --- a/runtime/program/print_formatter.cpp +++ b/runtime/program/print_formatter.cpp @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { PrintFormatter::PrintFormatter(Kernel &kernelArg, GraphicsAllocation &dataArg) : kernel(kernelArg), data(dataArg), @@ -196,4 +196,4 @@ bool PrintFormatter::isConversionSpecifier(char c) { return false; } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/print_formatter.h b/runtime/program/print_formatter.h index d758e88a85..2baa9d6405 100644 --- a/runtime/program/print_formatter.h +++ b/runtime/program/print_formatter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ extern int memcpy_s(void *dst, size_t destSize, const void *src, size_t count); -namespace OCLRT { +namespace NEO { enum class PRINTF_DATA_TYPE : int { INVALID, @@ -114,4 +114,4 @@ class PrintFormatter { uint32_t bufferSize; // size of the data contained in the buffer uint32_t offset; // current position in currently parsed buffer }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/program/printf_handler.cpp b/runtime/program/printf_handler.cpp index 24566e945d..44d7db6f77 100644 --- a/runtime/program/printf_handler.cpp +++ b/runtime/program/printf_handler.cpp @@ -15,7 +15,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/program/print_formatter.h" -namespace OCLRT { +namespace NEO { PrintfHandler::PrintfHandler(Device &deviceArg) : device(deviceArg) {} @@ -61,4 +61,4 @@ void PrintfHandler::printEnqueueOutput() { PrintFormatter printFormatter(*kernel, *printfSurface); printFormatter.printKernelOutput(); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/printf_handler.h b/runtime/program/printf_handler.h index 6be2d71754..224f702512 100644 --- a/runtime/program/printf_handler.h +++ b/runtime/program/printf_handler.h @@ -10,7 +10,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/kernel/kernel.h" -namespace OCLRT { +namespace NEO { struct MultiDispatchInfo; @@ -36,4 +36,4 @@ class PrintfHandler { Kernel *kernel = nullptr; GraphicsAllocation *printfSurface = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/process_elf_binary.cpp b/runtime/program/process_elf_binary.cpp index 8fe93c247c..94e7506a35 100644 --- a/runtime/program/process_elf_binary.cpp +++ b/runtime/program/process_elf_binary.cpp @@ -12,7 +12,7 @@ #include "program.h" -namespace OCLRT { +namespace NEO { cl_int Program::processElfBinary( const void *pBinary, @@ -159,4 +159,4 @@ cl_int Program::resolveProgramBinary() { } return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index cde98f5dc4..9a08ddf652 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -22,7 +22,7 @@ using namespace iOpenCL; -namespace OCLRT { +namespace NEO { extern bool familyEnabled[]; const KernelInfo *Program::getKernelInfo( @@ -1037,4 +1037,4 @@ void Program::processDebugData() { } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/process_spir_binary.cpp b/runtime/program/process_spir_binary.cpp index 5c462808d6..a59bb4de66 100644 --- a/runtime/program/process_spir_binary.cpp +++ b/runtime/program/process_spir_binary.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "program.h" -namespace OCLRT { +namespace NEO { bool Program::isValidSpirvBinary( const void *pBinary, @@ -39,4 +39,4 @@ cl_int Program::processSpirBinary( return CL_SUCCESS; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/program.cpp b/runtime/program/program.cpp index 29305f3b77..b002c9f407 100644 --- a/runtime/program/program.cpp +++ b/runtime/program/program.cpp @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { const std::string Program::clOptNameClVer("-cl-std=CL"); const std::string Program::clOptNameUniformWgs{"-cl-uniform-work-group-size"}; @@ -438,4 +438,4 @@ void Program::updateNonUniformFlag(const Program **inputPrograms, size_t numInpu } this->allowNonUniform = allowNonUniform; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/program/program.h b/runtime/program/program.h index 51c8612e40..ac2b6cb432 100644 --- a/runtime/program/program.h +++ b/runtime/program/program.h @@ -25,7 +25,7 @@ #define OCLRT_ALIGN(a, b) ((((a) % (b)) != 0) ? ((a) - ((a) % (b)) + (b)) : (a)) -namespace OCLRT { +namespace NEO { class Context; class CompilerInterface; class ExecutionEnvironment; @@ -338,4 +338,4 @@ class Program : public BaseObject<_cl_program> { friend class OfflineCompiler; // clang-format on }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sampler/sampler.cpp b/runtime/sampler/sampler.cpp index 84a16c50cb..428ff6ae0a 100644 --- a/runtime/sampler/sampler.cpp +++ b/runtime/sampler/sampler.cpp @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { SamplerCreateFunc samplerFactory[IGFX_MAX_CORE] = {}; getSamplerStateSizeHwFunc getSamplerStateSizeHw[IGFX_MAX_CORE] = {}; @@ -226,4 +226,4 @@ bool Sampler::isTransformable() const { normalizedCoordinates == CL_FALSE; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sampler/sampler.h b/runtime/sampler/sampler.h index 5184b44200..f9ebbfc7e6 100644 --- a/runtime/sampler/sampler.h +++ b/runtime/sampler/sampler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/api/cl_types.h" #include "runtime/helpers/base_object.h" -namespace OCLRT { +namespace NEO { class Context; struct HardwareInfo; @@ -137,4 +137,4 @@ inline Sampler *castToObject(const void *object) { auto clSamplerObj = reinterpret_cast(object); return castToObject(const_cast(clSamplerObj)); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sampler/sampler.inl b/runtime/sampler/sampler.inl index 25cf63ea05..2732b68480 100644 --- a/runtime/sampler/sampler.inl +++ b/runtime/sampler/sampler.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { template void SamplerHw::setArg(void *memory) { @@ -100,4 +100,4 @@ size_t SamplerHw::getSamplerStateSize() { using SAMPLER_STATE = typename GfxFamily::SAMPLER_STATE; return sizeof(SAMPLER_STATE); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/scheduler/scheduler_kernel.cpp b/runtime/scheduler/scheduler_kernel.cpp index 1dfd10b3a8..f46fe7c810 100644 --- a/runtime/scheduler/scheduler_kernel.cpp +++ b/runtime/scheduler/scheduler_kernel.cpp @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { void SchedulerKernel::setArgs(GraphicsAllocation *queue, GraphicsAllocation *commandsStack, @@ -61,4 +61,4 @@ void SchedulerKernel::computeGws() { DBG_LOG(PrintEMDebugInformation, "Scheduler GWS: ", gws); printDebugString(DebugManager.flags.PrintDebugMessages.get(), stderr, "Scheduler GWS: %" PRIu64, static_cast(gws)); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/scheduler/scheduler_kernel.h b/runtime/scheduler/scheduler_kernel.h index f19d2c1a88..35983c21c9 100644 --- a/runtime/scheduler/scheduler_kernel.h +++ b/runtime/scheduler/scheduler_kernel.h @@ -1,23 +1,8 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once @@ -25,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class SchedulerKernel : public Kernel { public: @@ -74,4 +59,4 @@ class SchedulerKernel : public Kernel { size_t gws; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/d3d/d3d_buffer.h b/runtime/sharings/d3d/d3d_buffer.h index f2c747fe93..ba89144a68 100644 --- a/runtime/sharings/d3d/d3d_buffer.h +++ b/runtime/sharings/d3d/d3d_buffer.h @@ -10,7 +10,7 @@ #include "runtime/memory_manager/memory_manager.h" #include "runtime/sharings/d3d/d3d_sharing.h" -namespace OCLRT { +namespace NEO { class Buffer; class Context; @@ -50,4 +50,4 @@ class D3DBuffer : public D3DSharing { D3DBuffer(Context *context, D3DBufferObj *d3dBuffer, D3DBufferObj *bufferStaging, bool sharedResource) : D3DSharing(context, d3dBuffer, bufferStaging, 0, sharedResource){}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/d3d/d3d_sharing.cpp b/runtime/sharings/d3d/d3d_sharing.cpp index c179270a43..9e4d4885a4 100644 --- a/runtime/sharings/d3d/d3d_sharing.cpp +++ b/runtime/sharings/d3d/d3d_sharing.cpp @@ -11,7 +11,7 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/mem_obj/image.h" -using namespace OCLRT; +using namespace NEO; template class D3DSharing; template class D3DSharing; diff --git a/runtime/sharings/d3d/d3d_sharing.h b/runtime/sharings/d3d/d3d_sharing.h index 9fbb9c7262..8cf59f8769 100644 --- a/runtime/sharings/d3d/d3d_sharing.h +++ b/runtime/sharings/d3d/d3d_sharing.h @@ -11,7 +11,7 @@ #include "d3d_sharing_functions.h" enum GMM_RESOURCE_FORMAT_ENUM; -namespace OCLRT { +namespace NEO { enum class OCLPlane; class Context; class Gmm; @@ -49,4 +49,4 @@ class D3DSharing : public SharingHandler { bool sharedResource = false; unsigned int subresource = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/d3d/d3d_surface.cpp b/runtime/sharings/d3d/d3d_surface.cpp index 4d63fb1f99..c7d462c404 100644 --- a/runtime/sharings/d3d/d3d_surface.cpp +++ b/runtime/sharings/d3d/d3d_surface.cpp @@ -18,7 +18,7 @@ #include "mmsystem.h" -using namespace OCLRT; +using namespace NEO; D3DSurface::D3DSurface(Context *context, cl_dx9_surface_info_khr *surfaceInfo, D3D9Surface *surfaceStaging, cl_uint plane, OCLPlane oclPlane, cl_dx9_media_adapter_type_khr adapterType, bool sharedResource, bool lockable) diff --git a/runtime/sharings/d3d/d3d_surface.h b/runtime/sharings/d3d/d3d_surface.h index 1f5a6e6bb3..93fee29e99 100644 --- a/runtime/sharings/d3d/d3d_surface.h +++ b/runtime/sharings/d3d/d3d_surface.h @@ -11,7 +11,7 @@ #include struct ErrorCodeHelper; -namespace OCLRT { +namespace NEO { enum class OCLPlane; class Image; class Context; @@ -50,4 +50,4 @@ class D3DSurface : public D3DSharing { D3D9Surface *d3d9SurfaceStaging = nullptr; D3DDevice *resourceDevice = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/d3d/d3d_texture.cpp b/runtime/sharings/d3d/d3d_texture.cpp index 27d92119d5..482aeace9c 100644 --- a/runtime/sharings/d3d/d3d_texture.cpp +++ b/runtime/sharings/d3d/d3d_texture.cpp @@ -16,7 +16,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" -using namespace OCLRT; +using namespace NEO; template class D3DTexture; template class D3DTexture; diff --git a/runtime/sharings/d3d/d3d_texture.h b/runtime/sharings/d3d/d3d_texture.h index b80b33c4e8..5fa1a0c20e 100644 --- a/runtime/sharings/d3d/d3d_texture.h +++ b/runtime/sharings/d3d/d3d_texture.h @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "runtime/sharings/d3d/d3d_sharing.h" -namespace OCLRT { +namespace NEO { class Context; class Image; @@ -48,4 +33,4 @@ class D3DTexture : public D3DSharing { D3DTexture(Context *context, D3DResource *d3dTexture, cl_uint subresource, D3DResource *textureStaging, bool sharedResource) : D3DSharing(context, d3dTexture, textureStaging, subresource, sharedResource){}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/d3d/enable_d3d.cpp b/runtime/sharings/d3d/enable_d3d.cpp index 469f7e0d4d..885aca4da3 100644 --- a/runtime/sharings/d3d/enable_d3d.cpp +++ b/runtime/sharings/d3d/enable_d3d.cpp @@ -19,7 +19,7 @@ #include -namespace OCLRT { +namespace NEO { bool D3DSharingContextBuilder::processProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue, cl_int &errcodeRet) { if (contextData.get() == nullptr) { @@ -158,5 +158,5 @@ void *D3DSharingBuilderFactory::getExtensionFunctionAddre static SharingFactory::RegisterSharing, D3DSharingFunctions> D3D9Sharing; static SharingFactory::RegisterSharing, D3DSharingFunctions> D3D10Sharing; static SharingFactory::RegisterSharing, D3DSharingFunctions> D3D11Sharing; -} // namespace OCLRT +} // namespace NEO #endif diff --git a/runtime/sharings/d3d/enable_d3d.h b/runtime/sharings/d3d/enable_d3d.h index fc78ce9f49..70e323326c 100644 --- a/runtime/sharings/d3d/enable_d3d.h +++ b/runtime/sharings/d3d/enable_d3d.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class Context; template @@ -38,4 +38,4 @@ class D3DSharingBuilderFactory : public SharingBuilderFactory { void fillGlobalDispatchTable() override; void *getExtensionFunctionAddress(const std::string &functionName) override; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/sharings/gl/cl_gl_api.cpp b/runtime/sharings/gl/cl_gl_api.cpp index fa16530112..f57cf66c56 100644 --- a/runtime/sharings/gl/cl_gl_api.cpp +++ b/runtime/sharings/gl/cl_gl_api.cpp @@ -27,7 +27,7 @@ #include "CL/cl_gl.h" #include "config.h" -using namespace OCLRT; +using namespace NEO; cl_mem CL_API_CALL clCreateFromGLBuffer(cl_context context, cl_mem_flags flags, cl_GLuint bufobj, cl_int *errcodeRet) { diff --git a/runtime/sharings/gl/enable_gl.h b/runtime/sharings/gl/enable_gl.h index 9f62f57d80..ebb7b39d73 100644 --- a/runtime/sharings/gl/enable_gl.h +++ b/runtime/sharings/gl/enable_gl.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class Context; struct GlCreateContextProperties { @@ -36,4 +36,4 @@ class GlSharingBuilderFactory : public SharingBuilderFactory { void fillGlobalDispatchTable() override; void *getExtensionFunctionAddress(const std::string &functionName) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_arb_sync_event.cpp b/runtime/sharings/gl/gl_arb_sync_event.cpp index 4cdd83a79d..e777898c85 100644 --- a/runtime/sharings/gl/gl_arb_sync_event.cpp +++ b/runtime/sharings/gl/gl_arb_sync_event.cpp @@ -18,7 +18,7 @@ #include -namespace OCLRT { +namespace NEO { GlArbSyncEvent::GlArbSyncEvent(Context &context) : Event(&context, nullptr, CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR, eventNotReady, eventNotReady), glSyncInfo(new CL_GL_SYNC_INFO{}) { @@ -31,7 +31,7 @@ bool GlArbSyncEvent::setBaseEvent(Event &ev) { auto cmdQueue = ev.getCommandQueue(); auto osInterface = cmdQueue->getCommandStreamReceiver().getOSInterface(); UNRECOVERABLE_IF(osInterface == nullptr); - if (false == ctx->getSharing()->glArbSyncObjectSetup(*osInterface, *glSyncInfo)) { + if (false == ctx->getSharing()->glArbSyncObjectSetup(*osInterface, *glSyncInfo)) { return false; } @@ -46,7 +46,7 @@ bool GlArbSyncEvent::setBaseEvent(Event &ev) { GlArbSyncEvent::~GlArbSyncEvent() { if (baseEvent != nullptr) { - ctx->getSharing()->glArbSyncObjectCleanup(*osInterface, glSyncInfo.get()); + ctx->getSharing()->glArbSyncObjectCleanup(*osInterface, glSyncInfo.get()); baseEvent->decRefInternal(); } } @@ -70,10 +70,10 @@ void GlArbSyncEvent::unblockEventBy(Event &event, uint32_t taskLevel, int32_t tr return; } - ctx->getSharing()->glArbSyncObjectSignal(event.getCommandQueue()->getCommandStreamReceiver().getOsContext(), *glSyncInfo); - ctx->getSharing()->glArbSyncObjectWaitServer(*osInterface, *glSyncInfo); + ctx->getSharing()->glArbSyncObjectSignal(event.getCommandQueue()->getCommandStreamReceiver().getOsContext(), *glSyncInfo); + ctx->getSharing()->glArbSyncObjectWaitServer(*osInterface, *glSyncInfo); } -} // namespace OCLRT +} // namespace NEO extern "C" CL_API_ENTRY cl_int CL_API_CALL clEnqueueMarkerWithSyncObjectINTEL(cl_command_queue commandQueue, @@ -94,7 +94,7 @@ clGetCLEventInfoINTEL(cl_event event, PCL_GL_SYNC_INFO *pSyncInfoHandleRet, cl_c return CL_INVALID_ARG_VALUE; } - auto neoEvent = OCLRT::castToObject(event); + auto neoEvent = NEO::castToObject(event); if (nullptr == neoEvent) { return CL_INVALID_EVENT; } @@ -105,12 +105,12 @@ clGetCLEventInfoINTEL(cl_event event, PCL_GL_SYNC_INFO *pSyncInfoHandleRet, cl_c return CL_SUCCESS; } - auto sharing = neoEvent->getContext()->getSharing(); + auto sharing = neoEvent->getContext()->getSharing(); if (sharing == nullptr) { return CL_INVALID_OPERATION; } - OCLRT::GlArbSyncEvent *arbSyncEvent = sharing->getOrCreateGlArbSyncEvent(*neoEvent); + NEO::GlArbSyncEvent *arbSyncEvent = sharing->getOrCreateGlArbSyncEvent(*neoEvent); if (nullptr == arbSyncEvent) { return CL_OUT_OF_RESOURCES; } @@ -125,12 +125,12 @@ clGetCLEventInfoINTEL(cl_event event, PCL_GL_SYNC_INFO *pSyncInfoHandleRet, cl_c extern "C" CL_API_ENTRY cl_int CL_API_CALL clReleaseGlSharedEventINTEL(cl_event event) { - auto neoEvent = OCLRT::castToObject(event); + auto neoEvent = NEO::castToObject(event); if (nullptr == neoEvent) { return CL_INVALID_EVENT; } - auto arbSyncEvent = neoEvent->getContext()->getSharing()->getGlArbSyncEvent(*neoEvent); - neoEvent->getContext()->getSharing()->removeGlArbSyncEventMapping(*neoEvent); + auto arbSyncEvent = neoEvent->getContext()->getSharing()->getGlArbSyncEvent(*neoEvent); + neoEvent->getContext()->getSharing()->removeGlArbSyncEventMapping(*neoEvent); if (nullptr != arbSyncEvent) { arbSyncEvent->release(); } diff --git a/runtime/sharings/gl/gl_arb_sync_event.h b/runtime/sharings/gl/gl_arb_sync_event.h index dbaf33c58d..ed42239089 100644 --- a/runtime/sharings/gl/gl_arb_sync_event.h +++ b/runtime/sharings/gl/gl_arb_sync_event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ struct _tagCLGLSyncInfo; typedef _tagCLGLSyncInfo CL_GL_SYNC_INFO; -namespace OCLRT { +namespace NEO { class Context; class GLSharingFunctions; class OsInterface; @@ -46,7 +46,7 @@ class GlArbSyncEvent : public Event { OSInterface *osInterface = nullptr; std::unique_ptr glSyncInfo; }; -} // namespace OCLRT +} // namespace NEO extern "C" CL_API_ENTRY cl_int CL_API_CALL clEnqueueMarkerWithSyncObjectINTEL(cl_command_queue commandQueue, diff --git a/runtime/sharings/gl/gl_buffer.cpp b/runtime/sharings/gl/gl_buffer.cpp index 99c161d96e..db8f54f64c 100644 --- a/runtime/sharings/gl/gl_buffer.cpp +++ b/runtime/sharings/gl/gl_buffer.cpp @@ -16,7 +16,7 @@ #include "config.h" -using namespace OCLRT; +using namespace NEO; Buffer *GlBuffer::createSharedGlBuffer(Context *context, cl_mem_flags flags, unsigned int bufferId, cl_int *errcodeRet) { ErrorCodeHelper errorCode(errcodeRet, CL_SUCCESS); diff --git a/runtime/sharings/gl/gl_buffer.h b/runtime/sharings/gl/gl_buffer.h index 8506d9bd50..653ce355c7 100644 --- a/runtime/sharings/gl/gl_buffer.h +++ b/runtime/sharings/gl/gl_buffer.h @@ -13,7 +13,7 @@ struct _tagCLGLBufferInfo; -namespace OCLRT { +namespace NEO { class Buffer; class Context; @@ -34,4 +34,4 @@ class GlBuffer : public GlSharing { static GraphicsAllocation *createGraphicsAllocation(Context *context, unsigned int bufferId, _tagCLGLBufferInfo &bufferInfo); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_cl_image_format.cpp b/runtime/sharings/gl/gl_cl_image_format.cpp index 78e883472c..c09904a219 100644 --- a/runtime/sharings/gl/gl_cl_image_format.cpp +++ b/runtime/sharings/gl/gl_cl_image_format.cpp @@ -12,7 +12,7 @@ #include "GL/gl.h" #include "config.h" -namespace OCLRT { +namespace NEO { bool GlTexture::setClImageFormat(int glFormat, cl_image_format &clImgFormat) { switch (glFormat) { case GL_RGBA8: @@ -198,4 +198,4 @@ bool GlTexture::setClImageFormat(int glFormat, cl_image_format &clImgFormat) { } return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_context_guard.cpp b/runtime/sharings/gl/gl_context_guard.cpp index e447011022..0ba618419c 100644 --- a/runtime/sharings/gl/gl_context_guard.cpp +++ b/runtime/sharings/gl/gl_context_guard.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/sharings/gl/gl_sharing.h" -namespace OCLRT { +namespace NEO { GLContextGuard::GLContextGuard(GLSharingFunctions &sharingFcns) : sharingFunctions(&sharingFcns) { currentContextHandle = sharingFcns.getCurrentContext(); currentDisplayHandle = sharingFcns.getCurrentDisplay(); @@ -31,4 +31,4 @@ GLContextGuard::~GLContextGuard() { sharingFunctions->makeCurrent(currentContextHandle, currentDisplayHandle); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_sharing.cpp b/runtime/sharings/gl/gl_sharing.cpp index 76d781c55d..3fb0b3d441 100644 --- a/runtime/sharings/gl/gl_sharing.cpp +++ b/runtime/sharings/gl/gl_sharing.cpp @@ -13,7 +13,7 @@ #include "runtime/sharings/gl/gl_arb_sync_event.h" #include "runtime/sharings/sharing_factory.h" -namespace OCLRT { +namespace NEO { const uint32_t GLSharingFunctions::sharingId = SharingType::CLGL_SHARING; int GlSharing::synchronizeHandler(UpdateData &updateData) { @@ -65,4 +65,4 @@ char *createArbSyncEventName() { } void destroyArbSyncEventName(char *name) { delete[] name; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_sharing.h b/runtime/sharings/gl/gl_sharing.h index e72a36c990..5d4f58b8c7 100644 --- a/runtime/sharings/gl/gl_sharing.h +++ b/runtime/sharings/gl/gl_sharing.h @@ -23,7 +23,7 @@ struct _tagCLGLSyncInfo; typedef struct _tagCLGLSyncInfo CL_GL_SYNC_INFO, *PCL_GL_SYNC_INFO; -namespace OCLRT { +namespace NEO { class Event; class GlArbSyncEvent; class GLSharingFunctions; @@ -284,4 +284,4 @@ class GLContextGuard { GLDisplay currentDisplayHandle; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_sync_event.cpp b/runtime/sharings/gl/gl_sync_event.cpp index a6a2797fa8..4a6ec289a6 100644 --- a/runtime/sharings/gl/gl_sync_event.cpp +++ b/runtime/sharings/gl/gl_sync_event.cpp @@ -19,7 +19,7 @@ #include "runtime/platform/platform.h" #include "runtime/sharings/gl/gl_sharing.h" -namespace OCLRT { +namespace NEO { GlSyncEvent::GlSyncEvent(Context &context, const GL_CL_SYNC_INFO &sync) : Event(&context, nullptr, CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR, eventNotReady, eventNotReady), glSync(new GL_CL_SYNC_INFO(sync)) { transitionExecutionStatus(CL_SUBMITTED); @@ -57,4 +57,4 @@ uint32_t GlSyncEvent::getTaskLevel() { } return Event::eventNotReady; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_sync_event.h b/runtime/sharings/gl/gl_sync_event.h index a4002a5d1c..bcc18535a6 100644 --- a/runtime/sharings/gl/gl_sync_event.h +++ b/runtime/sharings/gl/gl_sync_event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ struct _tagGLCLSyncInfo; typedef _tagGLCLSyncInfo GL_CL_SYNC_INFO; -namespace OCLRT { +namespace NEO { class Context; class GlSyncEvent : public Event { @@ -31,4 +31,4 @@ class GlSyncEvent : public Event { protected: std::unique_ptr glSync; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_texture.cpp b/runtime/sharings/gl/gl_texture.cpp index 808876701f..e0e34e4e3a 100644 --- a/runtime/sharings/gl/gl_texture.cpp +++ b/runtime/sharings/gl/gl_texture.cpp @@ -22,7 +22,7 @@ #include "config.h" #include -namespace OCLRT { +namespace NEO { Image *GlTexture::createSharedGlTexture(Context *context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel, cl_GLuint texture, cl_int *errcodeRet) { ErrorCodeHelper errorCode(errcodeRet, CL_INVALID_GL_OBJECT); @@ -243,4 +243,4 @@ void GlTexture::releaseResource(MemObj *memObject) { } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/gl_texture.h b/runtime/sharings/gl/gl_texture.h index 49c5626da9..82062b3a3f 100644 --- a/runtime/sharings/gl/gl_texture.h +++ b/runtime/sharings/gl/gl_texture.h @@ -12,7 +12,7 @@ #include "CL/cl_gl.h" -namespace OCLRT { +namespace NEO { class Context; class Image; class GlTexture : GlSharing { @@ -43,4 +43,4 @@ class GlTexture : GlSharing { cl_GLint miplevel; CL_GL_RESOURCE_INFO textureInfo; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/gl/win_enable_gl.cpp b/runtime/sharings/gl/win_enable_gl.cpp index e7f8939cfa..0d54268521 100644 --- a/runtime/sharings/gl/win_enable_gl.cpp +++ b/runtime/sharings/gl/win_enable_gl.cpp @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { bool GlSharingContextBuilder::processProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue, cl_int &errcodeRet) { @@ -101,4 +101,4 @@ std::string GlSharingBuilderFactory::getExtensions() { void *GlSharingBuilderFactory::getExtensionFunctionAddress(const std::string &functionName) { return nullptr; } static SharingFactory::RegisterSharing glSharing; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/sharing.cpp b/runtime/sharings/sharing.cpp index f8239f4470..10beddc938 100644 --- a/runtime/sharings/sharing.cpp +++ b/runtime/sharings/sharing.cpp @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { int SharingHandler::acquire(MemObj *memObj) { if (acquireCount == 0) { @@ -58,4 +58,4 @@ void SharingHandler::release(MemObj *memObject) { releaseResource(memObject); } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/sharing.h b/runtime/sharings/sharing.h index 7366999ba7..c9182667c3 100644 --- a/runtime/sharings/sharing.h +++ b/runtime/sharings/sharing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class Context; class MemObj; @@ -50,4 +50,4 @@ class SharingHandler { virtual void releaseResource(MemObj *memObject){}; unsigned int acquireCount = 0u; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/sharing_factory.cpp b/runtime/sharings/sharing_factory.cpp index 7e6cdd7368..68d231c1d8 100644 --- a/runtime/sharings/sharing_factory.cpp +++ b/runtime/sharings/sharing_factory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "sharing_factory.h" -namespace OCLRT { +namespace NEO { std::unique_ptr SharingFactory::build() { std::unique_ptr res(new SharingFactory()); @@ -71,4 +71,4 @@ SharingBuilderFactory *SharingFactory::sharingContextBuilder[SharingType::MAX_SH nullptr, }; SharingFactory sharingFactory; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/sharing_factory.h b/runtime/sharings/sharing_factory.h index 725d0e0982..9b4409347a 100644 --- a/runtime/sharings/sharing_factory.h +++ b/runtime/sharings/sharing_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class Context; enum SharingType { @@ -61,4 +61,4 @@ class SharingFactory { }; extern SharingFactory sharingFactory; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/sharing_factory.inl b/runtime/sharings/sharing_factory.inl index 08bd6b373f..f9cbaf75b0 100644 --- a/runtime/sharings/sharing_factory.inl +++ b/runtime/sharings/sharing_factory.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,10 +8,10 @@ #pragma once #include "runtime/sharings/sharing_factory.h" -namespace OCLRT { +namespace NEO { template SharingFactory::RegisterSharing::RegisterSharing() { sharingContextBuilder[T::sharingId] = new F; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/cl_va_api.cpp b/runtime/sharings/va/cl_va_api.cpp index d218c0ae76..9a76b09654 100644 --- a/runtime/sharings/va/cl_va_api.cpp +++ b/runtime/sharings/va/cl_va_api.cpp @@ -19,7 +19,7 @@ #include -using namespace OCLRT; +using namespace NEO; cl_mem CL_API_CALL clCreateFromVA_APIMediaSurfaceINTEL(cl_context context, cl_mem_flags flags, VASurfaceID *surface, diff --git a/runtime/sharings/va/enable_va.cpp b/runtime/sharings/va/enable_va.cpp index c4751ae5af..349ee1201f 100644 --- a/runtime/sharings/va/enable_va.cpp +++ b/runtime/sharings/va/enable_va.cpp @@ -18,7 +18,7 @@ #include -namespace OCLRT { +namespace NEO { bool VaSharingContextBuilder::processProperties(cl_context_properties &propertyType, cl_context_properties &propertyValue, cl_int &errcodeRet) { if (contextData.get() == nullptr) { @@ -84,5 +84,5 @@ void *VaSharingBuilderFactory::getExtensionFunctionAddress(const std::string &fu } static SharingFactory::RegisterSharing vaSharing; -} // namespace OCLRT +} // namespace NEO #endif diff --git a/runtime/sharings/va/enable_va.h b/runtime/sharings/va/enable_va.h index a0e0af3699..6be5b56925 100644 --- a/runtime/sharings/va/enable_va.h +++ b/runtime/sharings/va/enable_va.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { class Context; struct VaCreateContextProperties { @@ -35,4 +35,4 @@ class VaSharingBuilderFactory : public SharingBuilderFactory { void fillGlobalDispatchTable() override; void *getExtensionFunctionAddress(const std::string &functionName) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_sharing.cpp b/runtime/sharings/va/va_sharing.cpp index cacf894bc9..59a836fd9e 100644 --- a/runtime/sharings/va/va_sharing.cpp +++ b/runtime/sharings/va/va_sharing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,8 +10,8 @@ #include "runtime/sharings/va/va_sharing_defines.h" #include "runtime/sharings/va/va_sharing_functions.h" -namespace OCLRT { +namespace NEO { const uint32_t VASharingFunctions::sharingId = SharingType::VA_SHARING; template VASharingFunctions *Context::getSharing(); -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_sharing.h b/runtime/sharings/va/va_sharing.h index e37cb787ab..3b8701cd3e 100644 --- a/runtime/sharings/va/va_sharing.h +++ b/runtime/sharings/va/va_sharing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "runtime/sharings/va/va_sharing_defines.h" #include "runtime/sharings/va/va_sharing_functions.h" -namespace OCLRT { +namespace NEO { class VASharing : public SharingHandler { public: VASharing(VASharingFunctions *sharingFunctions, VAImageID imageId) @@ -22,4 +22,4 @@ class VASharing : public SharingHandler { VASharingFunctions *sharingFunctions = nullptr; VAImageID imageId; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_sharing_functions.cpp b/runtime/sharings/va/va_sharing_functions.cpp index f5cfca1fe0..93c2e678aa 100644 --- a/runtime/sharings/va/va_sharing_functions.cpp +++ b/runtime/sharings/va/va_sharing_functions.cpp @@ -15,7 +15,7 @@ namespace Os { extern const char *libvaDllName; } -namespace OCLRT { +namespace NEO { std::function VASharingFunctions::fdlopen = dlopen; std::function VASharingFunctions::fdlsym = dlsym; std::function VASharingFunctions::fdlclose = dlclose; @@ -60,4 +60,4 @@ void VASharingFunctions::initFunctions() { } } } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_sharing_functions.h b/runtime/sharings/va/va_sharing_functions.h index f014fee1b2..82a0699cac 100644 --- a/runtime/sharings/va/va_sharing_functions.h +++ b/runtime/sharings/va/va_sharing_functions.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class VASharingFunctions : public SharingFunctions { public: VASharingFunctions(VADisplay vaDisplay); @@ -66,4 +66,4 @@ class VASharingFunctions : public SharingFunctions { VAExtGetSurfaceHandlePFN vaExtGetSurfaceHandlePFN; VAGetLibFuncPFN vaGetLibFuncPFN; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_surface.cpp b/runtime/sharings/va/va_surface.cpp index 2ecb99cd61..c75142816d 100644 --- a/runtime/sharings/va/va_surface.cpp +++ b/runtime/sharings/va/va_surface.cpp @@ -15,7 +15,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { Image *VASurface::createSharedVaSurface(Context *context, VASharingFunctions *sharingFunctions, cl_mem_flags flags, VASurfaceID *surface, cl_uint plane, cl_int *errcodeRet) { @@ -97,4 +97,4 @@ void VASurface::getMemObjectInfo(size_t ¶mValueSize, void *¶mValue) { paramValue = &surfaceId; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sharings/va/va_surface.h b/runtime/sharings/va/va_surface.h index 6411abff64..9c581b2c20 100644 --- a/runtime/sharings/va/va_surface.h +++ b/runtime/sharings/va/va_surface.h @@ -9,7 +9,7 @@ #include "runtime/mem_obj/image.h" #include "runtime/sharings/va/va_sharing.h" -namespace OCLRT { +namespace NEO { class Context; class Image; @@ -32,4 +32,4 @@ class VASurface : VASharing { VASurfaceID *surfaceId; bool interopUserSync; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/definitions/sku_info.h b/runtime/sku_info/definitions/sku_info.h index 318425f702..2fef931c4f 100644 --- a/runtime/sku_info/definitions/sku_info.h +++ b/runtime/sku_info/definitions/sku_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,8 +8,8 @@ #pragma once #include "runtime/sku_info/sku_info_base.h" -namespace OCLRT { +namespace NEO { struct FeatureTable : FeatureTableBase {}; struct WorkaroundTable : WorkaroundTableBase {}; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/operations/sku_info_receiver.cpp b/runtime/sku_info/operations/sku_info_receiver.cpp index 63499dd6de..a4b013bf76 100644 --- a/runtime/sku_info/operations/sku_info_receiver.cpp +++ b/runtime/sku_info/operations/sku_info_receiver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "runtime/sku_info/operations/sku_info_receiver.h" -namespace OCLRT { +namespace NEO { void SkuInfoReceiver::receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _ADAPTER_INFO *adapterInfo) { receiveFtrTableFromAdapterInfoBase(ftrTable, adapterInfo); } @@ -15,4 +15,4 @@ void SkuInfoReceiver::receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _AD void SkuInfoReceiver::receiveWaTableFromAdapterInfo(WorkaroundTable *waTable, _ADAPTER_INFO *adapterInfo) { receiveWaTableFromAdapterInfoBase(waTable, adapterInfo); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/operations/sku_info_receiver.h b/runtime/sku_info/operations/sku_info_receiver.h index 15db1e66e6..e8c09ca7e3 100644 --- a/runtime/sku_info/operations/sku_info_receiver.h +++ b/runtime/sku_info/operations/sku_info_receiver.h @@ -11,7 +11,7 @@ #include "sku_info.h" #include "umKmInc/sharedata.h" -namespace OCLRT { +namespace NEO { class SkuInfoReceiver { public: static void receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _ADAPTER_INFO *adapterInfo); @@ -123,4 +123,4 @@ class SkuInfoReceiver { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/operations/sku_info_transfer.cpp b/runtime/sku_info/operations/sku_info_transfer.cpp index 2ce626dfce..89d191f4b0 100644 --- a/runtime/sku_info/operations/sku_info_transfer.cpp +++ b/runtime/sku_info/operations/sku_info_transfer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,12 +7,12 @@ #include "runtime/sku_info/operations/sku_info_transfer.h" -namespace OCLRT { -void SkuInfoTransfer::transferWaTableForGmm(_WA_TABLE *dstWaTable, const OCLRT::WorkaroundTable *srcWaTable) { +namespace NEO { +void SkuInfoTransfer::transferWaTableForGmm(_WA_TABLE *dstWaTable, const NEO::WorkaroundTable *srcWaTable) { transferWaTableForGmmBase(dstWaTable, srcWaTable); } -void SkuInfoTransfer::transferFtrTableForGmm(_SKU_FEATURE_TABLE *dstFtrTable, const OCLRT::FeatureTable *srcFtrTable) { +void SkuInfoTransfer::transferFtrTableForGmm(_SKU_FEATURE_TABLE *dstFtrTable, const NEO::FeatureTable *srcFtrTable) { transferFtrTableForGmmBase(dstFtrTable, srcFtrTable); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/operations/sku_info_transfer.h b/runtime/sku_info/operations/sku_info_transfer.h index dcde644284..57ae510e8c 100644 --- a/runtime/sku_info/operations/sku_info_transfer.h +++ b/runtime/sku_info/operations/sku_info_transfer.h @@ -11,14 +11,14 @@ #include "sku_info.h" -namespace OCLRT { +namespace NEO { class SkuInfoTransfer { public: static void transferFtrTableForGmm(_SKU_FEATURE_TABLE *dstFtrTable, const FeatureTable *srcFtrTable); static void transferWaTableForGmm(_WA_TABLE *dstWaTable, const WorkaroundTable *srcWaTable); protected: - static void transferFtrTableForGmmBase(_SKU_FEATURE_TABLE *dstFtrTable, const OCLRT::FeatureTable *srcFtrTable) { + static void transferFtrTableForGmmBase(_SKU_FEATURE_TABLE *dstFtrTable, const NEO::FeatureTable *srcFtrTable) { #define TRANSFER_FTR_TO_GMM(VAL_NAME) dstFtrTable->Ftr##VAL_NAME = srcFtrTable->ftr##VAL_NAME TRANSFER_FTR_TO_GMM(StandardMipTailFormat); TRANSFER_FTR_TO_GMM(ULT); @@ -40,7 +40,7 @@ class SkuInfoTransfer { #undef TRANSFER_FTR_TO_GMM } - static void transferWaTableForGmmBase(_WA_TABLE *dstWaTable, const OCLRT::WorkaroundTable *srcWaTable) { + static void transferWaTableForGmmBase(_WA_TABLE *dstWaTable, const NEO::WorkaroundTable *srcWaTable) { #define TRANSFER_WA_TO_GMM(VAL_NAME) dstWaTable->Wa##VAL_NAME = srcWaTable->wa##VAL_NAME TRANSFER_WA_TO_GMM(FbcLinearSurfaceStride); TRANSFER_WA_TO_GMM(DisableEdramForDisplayRT); @@ -50,4 +50,4 @@ class SkuInfoTransfer { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/sku_info/sku_info_base.h b/runtime/sku_info/sku_info_base.h index 6f20ea4ea0..4eda4e8db4 100644 --- a/runtime/sku_info/sku_info_base.h +++ b/runtime/sku_info/sku_info_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { struct FeatureTableBase { bool ftrDesktop = false; bool ftrChannelSwizzlingXOREnabled = false; @@ -108,4 +108,4 @@ struct WorkaroundTableBase { bool waCSRUncachable = false; bool waSamplerCacheFlushBetweenRedescribedSurfaceReads = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/source_level_debugger/source_level_debugger.cpp b/runtime/source_level_debugger/source_level_debugger.cpp index debaade262..6391d7618d 100644 --- a/runtime/source_level_debugger/source_level_debugger.cpp +++ b/runtime/source_level_debugger/source_level_debugger.cpp @@ -16,7 +16,7 @@ #define IGFXDBG_CURRENT_VERSION 4 -namespace OCLRT { +namespace NEO { const char *SourceLevelDebugger::notifyNewDeviceSymbol = "notifyNewDevice"; const char *SourceLevelDebugger::notifySourceCodeSymbol = "notifySourceCode"; const char *SourceLevelDebugger::getDebuggerOptionSymbol = "getDebuggerOption"; @@ -209,4 +209,4 @@ bool SourceLevelDebugger::initialize(bool useLocalMemory) { } return false; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/source_level_debugger/source_level_debugger.h b/runtime/source_level_debugger/source_level_debugger.h index a8b468462c..f0d3ec0573 100644 --- a/runtime/source_level_debugger/source_level_debugger.h +++ b/runtime/source_level_debugger/source_level_debugger.h @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct KernelInfo; class SourceLevelDebugger { @@ -51,4 +51,4 @@ class SourceLevelDebugger { // OS specific library name static const char *dllName; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/tbx/tbx_sockets.h b/runtime/tbx/tbx_sockets.h index 5e1d7efe5a..51c5892ffb 100644 --- a/runtime/tbx/tbx_sockets.h +++ b/runtime/tbx/tbx_sockets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { class TbxSockets { protected: @@ -29,4 +29,4 @@ class TbxSockets { static TbxSockets *create(); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/tbx/tbx_sockets_imp.cpp b/runtime/tbx/tbx_sockets_imp.cpp index aa4b4e4b74..0170959071 100644 --- a/runtime/tbx/tbx_sockets_imp.cpp +++ b/runtime/tbx/tbx_sockets_imp.cpp @@ -30,7 +30,7 @@ typedef struct sockaddr SOCKADDR; #include -namespace OCLRT { +namespace NEO { TbxSocketsImp::TbxSocketsImp(std::ostream &err) : cerrStream(err) { @@ -317,4 +317,4 @@ bool TbxSocketsImp::getResponseData(void *buffer, size_t sizeInBytes) { return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/tbx/tbx_sockets_imp.h b/runtime/tbx/tbx_sockets_imp.h index c6a295a0b0..99543dd976 100644 --- a/runtime/tbx/tbx_sockets_imp.h +++ b/runtime/tbx/tbx_sockets_imp.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { class TbxSocketsImp : public TbxSockets { public: @@ -44,4 +44,4 @@ class TbxSocketsImp : public TbxSockets { uint32_t transID = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/cpu_info.h b/runtime/utilities/cpu_info.h index 0876567b9f..9ccbe12f4d 100644 --- a/runtime/utilities/cpu_info.h +++ b/runtime/utilities/cpu_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #define BIT(x) (1ull << (x)) #endif -namespace OCLRT { +namespace NEO { struct CpuInfo { static const uint64_t featureNone = 0x000000000ULL; static const uint64_t featureGenericIA32 = 0x000000001ULL; @@ -192,4 +192,4 @@ struct CpuInfo { static const CpuInfo instance; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/debug_file_reader.cpp b/runtime/utilities/debug_file_reader.cpp index 639d4f88f7..e4095a629b 100644 --- a/runtime/utilities/debug_file_reader.cpp +++ b/runtime/utilities/debug_file_reader.cpp @@ -9,7 +9,7 @@ using namespace std; -namespace OCLRT { +namespace NEO { SettingsFileReader::SettingsFileReader(const char *filePath) { std::ifstream settingsFile; @@ -90,4 +90,4 @@ void SettingsFileReader::parseStream(std::istream &inputStream) { key.clear(); } } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/debug_file_reader.h b/runtime/utilities/debug_file_reader.h index 80fcb02186..75862a83d8 100644 --- a/runtime/utilities/debug_file_reader.h +++ b/runtime/utilities/debug_file_reader.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { class SettingsFileReader : public SettingsReader { public: @@ -30,4 +30,4 @@ class SettingsFileReader : public SettingsReader { std::map settingValueMap; std::map settingStringMap; }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/debug_settings_reader.cpp b/runtime/utilities/debug_settings_reader.cpp index 6796bb9387..f8141bd7ab 100644 --- a/runtime/utilities/debug_settings_reader.cpp +++ b/runtime/utilities/debug_settings_reader.cpp @@ -9,7 +9,7 @@ #include "debug_file_reader.h" -namespace OCLRT { +namespace NEO { const char *SettingsReader::settingsFileName = "igdrcl.config"; @@ -22,4 +22,4 @@ SettingsReader *SettingsReader::createFileReader() { } return nullptr; } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/debug_settings_reader.h b/runtime/utilities/debug_settings_reader.h index 7da283c9cb..b5bec70cad 100644 --- a/runtime/utilities/debug_settings_reader.h +++ b/runtime/utilities/debug_settings_reader.h @@ -10,7 +10,7 @@ #include #include -namespace OCLRT { +namespace NEO { class SettingsReader { public: @@ -31,4 +31,4 @@ class SettingsReader { virtual const char *appSpecificLocation(const std::string &name) = 0; static const char *settingsFileName; }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/debug_settings_reader_creator.cpp b/runtime/utilities/debug_settings_reader_creator.cpp index 27622b9d2b..665eba529e 100644 --- a/runtime/utilities/debug_settings_reader_creator.cpp +++ b/runtime/utilities/debug_settings_reader_creator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/utilities/debug_settings_reader_creator.h" -namespace OCLRT { +namespace NEO { std::unique_ptr SettingsReaderCreator::create() { return std::unique_ptr(SettingsReader::create()); } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/debug_settings_reader_creator.h b/runtime/utilities/debug_settings_reader_creator.h index 03dc4bce49..20a27af832 100644 --- a/runtime/utilities/debug_settings_reader_creator.h +++ b/runtime/utilities/debug_settings_reader_creator.h @@ -11,9 +11,9 @@ #include -namespace OCLRT { +namespace NEO { class SettingsReaderCreator { public: static std::unique_ptr create(); }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/directory.h b/runtime/utilities/directory.h index 97db1a2bac..de680ad61c 100644 --- a/runtime/utilities/directory.h +++ b/runtime/utilities/directory.h @@ -9,10 +9,10 @@ #include #include -namespace OCLRT { +namespace NEO { class Directory { public: static std::vector getFiles(std::string &path); }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/heap_allocator.cpp b/runtime/utilities/heap_allocator.cpp index 9a5d66edba..f28bbea9cc 100644 --- a/runtime/utilities/heap_allocator.cpp +++ b/runtime/utilities/heap_allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #include "runtime/utilities/heap_allocator.h" -namespace OCLRT { +namespace NEO { bool operator<(const HeapChunk &hc1, const HeapChunk &hc2) { return hc1.ptr < hc2.ptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/heap_allocator.h b/runtime/utilities/heap_allocator.h index d8d1e9f777..9ebf8ef005 100644 --- a/runtime/utilities/heap_allocator.h +++ b/runtime/utilities/heap_allocator.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct HeapChunk { HeapChunk(uint64_t ptr, size_t size) : ptr(ptr), size(size) {} @@ -246,4 +246,4 @@ class HeapAllocator { DBG_LOG(PrintDebugMessages, __FUNCTION__, "Allocator usage == ", this->getUsage()); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/idlist.h b/runtime/utilities/idlist.h index 2c61c5fff4..067ea7f302 100644 --- a/runtime/utilities/idlist.h +++ b/runtime/utilities/idlist.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { template struct IDNode { @@ -468,4 +468,4 @@ class IDRefList : public IDList, ThreadSafe, OwnsNodes refNode.release(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/iflist.h b/runtime/utilities/iflist.h index c07fccf544..5cd8712f6d 100644 --- a/runtime/utilities/iflist.h +++ b/runtime/utilities/iflist.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include #include -namespace OCLRT { +namespace NEO { template struct PtrType { @@ -191,4 +191,4 @@ class IFRefList : public IFList, ThreadSafe, OwnsNodes up.release(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/linux/cpu_info.cpp b/runtime/utilities/linux/cpu_info.cpp index 572c7a8536..1a5a32f4ac 100644 --- a/runtime/utilities/linux/cpu_info.cpp +++ b/runtime/utilities/linux/cpu_info.cpp @@ -1,30 +1,15 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/utilities/cpu_info.h" #include -namespace OCLRT { +namespace NEO { void cpuidex_linux_wrapper(int *cpuInfo, int functionId, int subfunctionId) { __cpuid_count(functionId, subfunctionId, cpuInfo[0], cpuInfo[1], cpuInfo[2], cpuInfo[3]); @@ -47,4 +32,4 @@ void CpuInfo::cpuidex( cpuidexFunc(reinterpret_cast(cpuInfo), functionId, subfunctionId); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/linux/debug_env_reader.h b/runtime/utilities/linux/debug_env_reader.h index 89af606e04..d937e01f33 100644 --- a/runtime/utilities/linux/debug_env_reader.h +++ b/runtime/utilities/linux/debug_env_reader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/utilities/debug_settings_reader.h" -namespace OCLRT { +namespace NEO { class EnvironmentVariableReader : public SettingsReader { public: @@ -19,4 +19,4 @@ class EnvironmentVariableReader : public SettingsReader { std::string getSetting(const char *settingName, const std::string &value) override; const char *appSpecificLocation(const std::string &name) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/linux/directory.cpp b/runtime/utilities/linux/directory.cpp index 780ab06967..8eefc65df5 100644 --- a/runtime/utilities/linux/directory.cpp +++ b/runtime/utilities/linux/directory.cpp @@ -10,7 +10,7 @@ #include #include -namespace OCLRT { +namespace NEO { std::vector Directory::getFiles(std::string &path) { std::vector files; @@ -37,4 +37,4 @@ std::vector Directory::getFiles(std::string &path) { closedir(dir); return files; } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/linux/timer_util.cpp b/runtime/utilities/linux/timer_util.cpp index 7c6ca3d0ab..d104a17f36 100644 --- a/runtime/utilities/linux/timer_util.cpp +++ b/runtime/utilities/linux/timer_util.cpp @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { class Timer::TimerImpl { @@ -94,4 +94,4 @@ Timer &Timer::operator=(const Timer &t) { void Timer::setFreq() { TimerImpl::setFreq(); } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/numeric.h b/runtime/utilities/numeric.h index f552dc9a46..8e91010ec2 100644 --- a/runtime/utilities/numeric.h +++ b/runtime/utilities/numeric.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { template struct StorageType; @@ -87,4 +87,4 @@ struct UnsignedFixedPointValue { }; using FixedU4D8 = UnsignedFixedPointValue<4, 8>; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/perf_profiler.cpp b/runtime/utilities/perf_profiler.cpp index 080b51fc1b..f732140218 100644 --- a/runtime/utilities/perf_profiler.cpp +++ b/runtime/utilities/perf_profiler.cpp @@ -18,7 +18,7 @@ using namespace std; -namespace OCLRT { +namespace NEO { std::atomic PerfProfiler::counter(0); @@ -178,4 +178,4 @@ void PerfProfiler::logTimes(long long start, long long end, long long span, unsi void PerfProfiler::logSysTimes(long long start, unsigned long long time, unsigned int id) { systemLogs.emplace_back(SystemLog{id, start, time}); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/perf_profiler.h b/runtime/utilities/perf_profiler.h index 8e83a235b3..cc13fac9be 100644 --- a/runtime/utilities/perf_profiler.h +++ b/runtime/utilities/perf_profiler.h @@ -15,7 +15,7 @@ #include #include -namespace OCLRT { +namespace NEO { class PerfProfiler { struct SystemLog { @@ -116,4 +116,4 @@ struct PerfProfilerApiWrapper { const char *funcName; }; #endif -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/range.h b/runtime/utilities/range.h index dfde445467..893ed98e7e 100644 --- a/runtime/utilities/range.h +++ b/runtime/utilities/range.h @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { template struct Range { @@ -80,4 +80,4 @@ template inline Range CreateRange(T *base, size_t count) { return Range(base, count); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/runtime/utilities/reference_tracked_object.h b/runtime/utilities/reference_tracked_object.h index 8367d7598b..1f59934764 100644 --- a/runtime/utilities/reference_tracked_object.h +++ b/runtime/utilities/reference_tracked_object.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { template class RefCounter { @@ -175,4 +175,4 @@ template inline ReferenceTrackedObject::~ReferenceTrackedObject() { DEBUG_BREAK_IF(refInternal.peek() > 1); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/spinlock.h b/runtime/utilities/spinlock.h index b44a4a7abb..71f19d9590 100644 --- a/runtime/utilities/spinlock.h +++ b/runtime/utilities/spinlock.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class SpinLock : NonCopyableOrMovableClass { public: @@ -35,4 +35,4 @@ class SpinLock : NonCopyableOrMovableClass { std::atomic_flag flag = ATOMIC_FLAG_INIT; }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/tag_allocator.h b/runtime/utilities/tag_allocator.h index c5899c5fd4..8d45b08f1e 100644 --- a/runtime/utilities/tag_allocator.h +++ b/runtime/utilities/tag_allocator.h @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; template @@ -177,4 +177,4 @@ class TagAllocator { } } }; -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/timer_util.h b/runtime/utilities/timer_util.h index f8a0af56b9..54da62b962 100644 --- a/runtime/utilities/timer_util.h +++ b/runtime/utilities/timer_util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { class Timer { public: @@ -34,4 +34,4 @@ class Timer { class TimerImpl; TimerImpl *timerImpl; }; -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/windows/cpu_info.cpp b/runtime/utilities/windows/cpu_info.cpp index eafbd0f839..6c2ae4395c 100644 --- a/runtime/utilities/windows/cpu_info.cpp +++ b/runtime/utilities/windows/cpu_info.cpp @@ -9,7 +9,7 @@ #include -namespace OCLRT { +namespace NEO { void cpuidex_windows_wrapper(int *cpuInfo, int functionId, int subfunctionId) { __cpuidex(cpuInfo, functionId, subfunctionId); @@ -32,4 +32,4 @@ void CpuInfo::cpuidex( cpuidexFunc(reinterpret_cast(cpuInfo), functionId, subfunctionId); } -} // namespace OCLRT +} // namespace NEO diff --git a/runtime/utilities/windows/directory.cpp b/runtime/utilities/windows/directory.cpp index 5ccde32a32..d55cc07fbf 100644 --- a/runtime/utilities/windows/directory.cpp +++ b/runtime/utilities/windows/directory.cpp @@ -9,7 +9,7 @@ #include "runtime/os_interface/windows/windows_wrapper.h" -namespace OCLRT { +namespace NEO { std::vector Directory::getFiles(std::string &path) { std::vector files; @@ -37,4 +37,4 @@ std::vector Directory::getFiles(std::string &path) { FindClose(hFind); return files; } -}; // namespace OCLRT +}; // namespace NEO diff --git a/runtime/utilities/windows/timer_util.cpp b/runtime/utilities/windows/timer_util.cpp index a90044c34e..40b02e83bc 100644 --- a/runtime/utilities/windows/timer_util.cpp +++ b/runtime/utilities/windows/timer_util.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/debug_helpers.h" #include "runtime/os_interface/windows/windows_wrapper.h" -namespace OCLRT { +namespace NEO { class Timer::TimerImpl { public: @@ -109,4 +109,4 @@ Timer &Timer::operator=(const Timer &t) { void Timer::setFreq() { TimerImpl::setFreq(); } -}; // namespace OCLRT +}; // namespace NEO diff --git a/unit_tests/abort.cpp b/unit_tests/abort.cpp index d41f58c3f9..ed5edfc1f2 100644 --- a/unit_tests/abort.cpp +++ b/unit_tests/abort.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,8 +9,8 @@ #include -namespace OCLRT { +namespace NEO { void abortExecution() { throw std::exception(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/accelerators/media_image_arg_tests.cpp b/unit_tests/accelerators/media_image_arg_tests.cpp index 83614255b0..616fc3b80b 100644 --- a/unit_tests/accelerators/media_image_arg_tests.cpp +++ b/unit_tests/accelerators/media_image_arg_tests.cpp @@ -19,7 +19,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; class MediaImageSetArgTest : public DeviceFixture, public testing::Test { diff --git a/unit_tests/api/cl_api_tests.cpp b/unit_tests/api/cl_api_tests.cpp index 8ad846ed4d..5672f17b47 100644 --- a/unit_tests/api/cl_api_tests.cpp +++ b/unit_tests/api/cl_api_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_memory_manager.h" -namespace OCLRT { +namespace NEO { api_fixture::api_fixture() : retVal(CL_SUCCESS), retSize(0), pCommandQueue(nullptr), @@ -76,4 +76,4 @@ void api_fixture_using_aligned_memory_manager::TearDown() { program->release(); delete device; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/api/cl_api_tests.h b/unit_tests/api/cl_api_tests.h index db0905c899..99d08c8671 100644 --- a/unit_tests/api/cl_api_tests.h +++ b/unit_tests/api/cl_api_tests.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { class CommandQueue; class Context; @@ -68,4 +68,4 @@ struct api_fixture_using_aligned_memory_manager { using api_test_using_aligned_memory_manager = Test; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/api/cl_build_program_tests.inl b/unit_tests/api/cl_build_program_tests.inl index f3614dcd5e..bc27b0aa77 100644 --- a/unit_tests/api/cl_build_program_tests.inl +++ b/unit_tests/api/cl_build_program_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clBuildProgramTests; diff --git a/unit_tests/api/cl_clone_kernel_tests.inl b/unit_tests/api/cl_clone_kernel_tests.inl index dddb7303fe..db2ed6d2b9 100644 --- a/unit_tests/api/cl_clone_kernel_tests.inl +++ b/unit_tests/api/cl_clone_kernel_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCloneKernelTests; diff --git a/unit_tests/api/cl_compile_program_tests.inl b/unit_tests/api/cl_compile_program_tests.inl index f97ba7d5fa..aae0f35c2a 100644 --- a/unit_tests/api/cl_compile_program_tests.inl +++ b/unit_tests/api/cl_compile_program_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCompileProgramTests; diff --git a/unit_tests/api/cl_create_buffer_tests.cpp b/unit_tests/api/cl_create_buffer_tests.cpp index 4b14f0cf81..21a0a0985a 100644 --- a/unit_tests/api/cl_create_buffer_tests.cpp +++ b/unit_tests/api/cl_create_buffer_tests.cpp @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateBufferTests; @@ -250,7 +250,7 @@ TEST_F(clCreateBufferTestsWithRestrictions, GivenMemoryManagerRestrictionsWhenMi ASSERT_EQ(CL_SUCCESS, retVal); EXPECT_NE(nullptr, buffer); - Buffer *bufferObj = OCLRT::castToObject(buffer); + Buffer *bufferObj = NEO::castToObject(buffer); EXPECT_TRUE(bufferObj->isMemObjZeroCopy()); retVal = clReleaseMemObject(buffer); @@ -280,7 +280,7 @@ TEST_F(clCreateBufferTestsWithRestrictions, GivenMemoryManagerRestrictionsWhenMi ASSERT_EQ(CL_SUCCESS, retVal); EXPECT_NE(nullptr, buffer); - Buffer *bufferObj = OCLRT::castToObject(buffer); + Buffer *bufferObj = NEO::castToObject(buffer); EXPECT_FALSE(bufferObj->isMemObjZeroCopy()); retVal = clReleaseMemObject(buffer); diff --git a/unit_tests/api/cl_create_command_queue_tests.inl b/unit_tests/api/cl_create_command_queue_tests.inl index 77769f23f0..90e62f9e45 100644 --- a/unit_tests/api/cl_create_command_queue_tests.inl +++ b/unit_tests/api/cl_create_command_queue_tests.inl @@ -13,7 +13,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateCommandQueueTest; diff --git a/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp b/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp index 40f1bd0ddc..bcb5a8dd57 100644 --- a/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp +++ b/unit_tests/api/cl_create_command_queue_with_properties_tests.cpp @@ -18,7 +18,7 @@ #include "CL/cl_ext.h" #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_create_context_from_type_tests.inl b/unit_tests/api/cl_create_context_from_type_tests.inl index 3259a4efa3..c0db414408 100644 --- a/unit_tests/api/cl_create_context_from_type_tests.inl +++ b/unit_tests/api/cl_create_context_from_type_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateContextFromTypeTests; diff --git a/unit_tests/api/cl_create_context_tests.inl b/unit_tests/api/cl_create_context_tests.inl index 0091f78b4c..85dbae5b6b 100644 --- a/unit_tests/api/cl_create_context_tests.inl +++ b/unit_tests/api/cl_create_context_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateContextTests; diff --git a/unit_tests/api/cl_create_image_tests.cpp b/unit_tests/api/cl_create_image_tests.cpp index 3d5d9012ca..88c05363a2 100644 --- a/unit_tests/api/cl_create_image_tests.cpp +++ b/unit_tests/api/cl_create_image_tests.cpp @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ClCreateImageTests { diff --git a/unit_tests/api/cl_create_kernel_tests.inl b/unit_tests/api/cl_create_kernel_tests.inl index 77c3da8ded..ddd7c6d310 100644 --- a/unit_tests/api/cl_create_kernel_tests.inl +++ b/unit_tests/api/cl_create_kernel_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateKernelTests; diff --git a/unit_tests/api/cl_create_kernels_in_program_tests.inl b/unit_tests/api/cl_create_kernels_in_program_tests.inl index af6402a3d4..6d72793fa9 100644 --- a/unit_tests/api/cl_create_kernels_in_program_tests.inl +++ b/unit_tests/api/cl_create_kernels_in_program_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct clCreateKernelsInProgramTests : public api_tests { void SetUp() override { diff --git a/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl b/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl index 079d40ce02..d843cc786f 100644 --- a/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl +++ b/unit_tests/api/cl_create_perf_counters_command_queue_tests.inl @@ -14,7 +14,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct clCreatePerfCountersCommandQueueINTELTests : public DeviceInstrumentationFixture, public PerformanceCountersDeviceFixture, diff --git a/unit_tests/api/cl_create_pipe_tests.inl b/unit_tests/api/cl_create_pipe_tests.inl index f0459422f3..4d7244cf1e 100644 --- a/unit_tests/api/cl_create_pipe_tests.inl +++ b/unit_tests/api/cl_create_pipe_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreatePipeTests; diff --git a/unit_tests/api/cl_create_program_with_binary_tests.inl b/unit_tests/api/cl_create_program_with_binary_tests.inl index 799737fb25..01e02f9322 100644 --- a/unit_tests/api/cl_create_program_with_binary_tests.inl +++ b/unit_tests/api/cl_create_program_with_binary_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateProgramWithBinaryTests; typedef api_tests clCreateProgramWithILTests; diff --git a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp b/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp index c632e7c401..80130c6797 100644 --- a/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp +++ b/unit_tests/api/cl_create_program_with_built_in_kernels_tests.cpp @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateProgramWithBuiltInKernelsTests; @@ -169,7 +169,7 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, GivenVmeBlockMotionEstimateKernel EXPECT_EQ(6U, kernNeo->getKernelArgsNumber()); auto ctxNeo = castToObject(pContext); - auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(OCLRT::EBuiltInOps::VmeBlockMotionEstimateIntel, *ctxNeo, *ctxNeo->getDevice(0)); + auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(NEO::EBuiltInOps::VmeBlockMotionEstimateIntel, *ctxNeo, *ctxNeo->getDevice(0)); EXPECT_EQ(&vmeBuilder, kernNeo->getKernelInfo().builtinDispatchBuilder); clReleaseKernel(kernel); @@ -208,7 +208,7 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, GivenVmeBlockAdvancedMotionEstima EXPECT_EQ(15U, kernNeo->getKernelArgsNumber()); auto ctxNeo = castToObject(pContext); - auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(OCLRT::EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, *ctxNeo, *ctxNeo->getDevice(0)); + auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(NEO::EBuiltInOps::VmeBlockAdvancedMotionEstimateCheckIntel, *ctxNeo, *ctxNeo->getDevice(0)); EXPECT_EQ(&vmeBuilder, kernNeo->getKernelInfo().builtinDispatchBuilder); clReleaseKernel(kernel); @@ -247,7 +247,7 @@ TEST_F(clCreateProgramWithBuiltInKernelsTests, GivenVmeBlockAdvancedMotionEstima EXPECT_EQ(20U, kernNeo->getKernelArgsNumber()); auto ctxNeo = castToObject(pContext); - auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(OCLRT::EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel, *ctxNeo, *ctxNeo->getDevice(0)); + auto &vmeBuilder = pDev->getExecutionEnvironment()->getBuiltIns()->getBuiltinDispatchInfoBuilder(NEO::EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirectionalCheckIntel, *ctxNeo, *ctxNeo->getDevice(0)); EXPECT_EQ(&vmeBuilder, kernNeo->getKernelInfo().builtinDispatchBuilder); clReleaseKernel(kernel); diff --git a/unit_tests/api/cl_create_sampler_tests.inl b/unit_tests/api/cl_create_sampler_tests.inl index 8dc1484126..82ecdbad55 100644 --- a/unit_tests/api/cl_create_sampler_tests.inl +++ b/unit_tests/api/cl_create_sampler_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateSamplerTests; diff --git a/unit_tests/api/cl_create_sampler_with_properties_tests.inl b/unit_tests/api/cl_create_sampler_with_properties_tests.inl index bf642c193b..2ca346d8b8 100644 --- a/unit_tests/api/cl_create_sampler_with_properties_tests.inl +++ b/unit_tests/api/cl_create_sampler_with_properties_tests.inl @@ -11,7 +11,7 @@ #include "CL/cl_ext.h" #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_create_sub_buffer_tests.inl b/unit_tests/api/cl_create_sub_buffer_tests.inl index 8a00efaacc..674bba12fe 100644 --- a/unit_tests/api/cl_create_sub_buffer_tests.inl +++ b/unit_tests/api/cl_create_sub_buffer_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ClCreateSubbufferTests { diff --git a/unit_tests/api/cl_create_sub_devices_tests.inl b/unit_tests/api/cl_create_sub_devices_tests.inl index ee2ab8f0bc..d346a90654 100644 --- a/unit_tests/api/cl_create_sub_devices_tests.inl +++ b/unit_tests/api/cl_create_sub_devices_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateSubDevicesTests; diff --git a/unit_tests/api/cl_create_user_event_tests.inl b/unit_tests/api/cl_create_user_event_tests.inl index 75f57813b3..1080f55f34 100644 --- a/unit_tests/api/cl_create_user_event_tests.inl +++ b/unit_tests/api/cl_create_user_event_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateUserEventTests; diff --git a/unit_tests/api/cl_create_user_event_tests_mt.cpp b/unit_tests/api/cl_create_user_event_tests_mt.cpp index a1195e26a2..e9dce14e30 100644 --- a/unit_tests/api/cl_create_user_event_tests_mt.cpp +++ b/unit_tests/api/cl_create_user_event_tests_mt.cpp @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateUserEventMtTests; diff --git a/unit_tests/api/cl_enqueue_barrier_tests.inl b/unit_tests/api/cl_enqueue_barrier_tests.inl index fe900b9e47..2959854e7e 100644 --- a/unit_tests/api/cl_enqueue_barrier_tests.inl +++ b/unit_tests/api/cl_enqueue_barrier_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueBarrierTests; diff --git a/unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl b/unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl index 836fe62c72..ebf00094a6 100644 --- a/unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl +++ b/unit_tests/api/cl_enqueue_barrier_with_wait_list_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueBarrierWithWaitListTests; diff --git a/unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl b/unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl index df2f673d04..8a5c675272 100644 --- a/unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl +++ b/unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueCopyBufferRectTests; diff --git a/unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl b/unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl index 2f70c73db1..9687ffb385 100644 --- a/unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl +++ b/unit_tests/api/cl_enqueue_copy_buffer_to_image_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueCopyBufferToImageTests; diff --git a/unit_tests/api/cl_enqueue_copy_image_tests.inl b/unit_tests/api/cl_enqueue_copy_image_tests.inl index eeb0da3384..e7f1db4eaf 100644 --- a/unit_tests/api/cl_enqueue_copy_image_tests.inl +++ b/unit_tests/api/cl_enqueue_copy_image_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueCopyImageTests; diff --git a/unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl b/unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl index da08279413..8e25d1a04d 100644 --- a/unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl +++ b/unit_tests/api/cl_enqueue_copy_image_to_buffer_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueCopyImageToBufferTests; diff --git a/unit_tests/api/cl_enqueue_fill_buffer_tests.inl b/unit_tests/api/cl_enqueue_fill_buffer_tests.inl index 558166fa0c..32d2a1c9c5 100644 --- a/unit_tests/api/cl_enqueue_fill_buffer_tests.inl +++ b/unit_tests/api/cl_enqueue_fill_buffer_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueFillBufferTests; diff --git a/unit_tests/api/cl_enqueue_fill_image_tests.inl b/unit_tests/api/cl_enqueue_fill_image_tests.inl index b81833872e..514a062354 100644 --- a/unit_tests/api/cl_enqueue_fill_image_tests.inl +++ b/unit_tests/api/cl_enqueue_fill_image_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueFillImageTests; diff --git a/unit_tests/api/cl_enqueue_image_tests.inl b/unit_tests/api/cl_enqueue_image_tests.inl index 35cd9d8b61..d5471f18a3 100644 --- a/unit_tests/api/cl_enqueue_image_tests.inl +++ b/unit_tests/api/cl_enqueue_image_tests.inl @@ -13,7 +13,7 @@ #include -using namespace OCLRT; +using namespace NEO; using ImageEnqueueCall = std::function; diff --git a/unit_tests/api/cl_enqueue_map_buffer_tests.inl b/unit_tests/api/cl_enqueue_map_buffer_tests.inl index a31cd042fe..c944a7cdc5 100644 --- a/unit_tests/api/cl_enqueue_map_buffer_tests.inl +++ b/unit_tests/api/cl_enqueue_map_buffer_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueMapBufferTests; diff --git a/unit_tests/api/cl_enqueue_map_image_tests.inl b/unit_tests/api/cl_enqueue_map_image_tests.inl index d3786a5abf..3f46e559c8 100644 --- a/unit_tests/api/cl_enqueue_map_image_tests.inl +++ b/unit_tests/api/cl_enqueue_map_image_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_enqueue_marker_tests.inl b/unit_tests/api/cl_enqueue_marker_tests.inl index 779bf255d5..628d8cc981 100644 --- a/unit_tests/api/cl_enqueue_marker_tests.inl +++ b/unit_tests/api/cl_enqueue_marker_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueMarkerTests; diff --git a/unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl b/unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl index cacb005264..7410be44ae 100644 --- a/unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl +++ b/unit_tests/api/cl_enqueue_marker_with_wait_list_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueMarkerWithWaitListTests; diff --git a/unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl b/unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl index f01a6ca5f4..5aa6a4475c 100644 --- a/unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl +++ b/unit_tests/api/cl_enqueue_migrate_mem_objects_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueMigrateMemObjectsTests; diff --git a/unit_tests/api/cl_enqueue_native_kernel_tests.inl b/unit_tests/api/cl_enqueue_native_kernel_tests.inl index 82be153c02..d8884c82a0 100644 --- a/unit_tests/api/cl_enqueue_native_kernel_tests.inl +++ b/unit_tests/api/cl_enqueue_native_kernel_tests.inl @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueNativeKernelTests; diff --git a/unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl b/unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl index bec199fe8a..df1932d13e 100644 --- a/unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl +++ b/unit_tests/api/cl_enqueue_nd_range_kernel_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueNDRangeKernelTests; diff --git a/unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl b/unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl index c4b94a1b39..aafd1a3099 100644 --- a/unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl +++ b/unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueReadBufferRectTest; diff --git a/unit_tests/api/cl_enqueue_read_buffer_tests.inl b/unit_tests/api/cl_enqueue_read_buffer_tests.inl index edc0bfecfd..b1dde71fcd 100644 --- a/unit_tests/api/cl_enqueue_read_buffer_tests.inl +++ b/unit_tests/api/cl_enqueue_read_buffer_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueReadBufferTests; diff --git a/unit_tests/api/cl_enqueue_read_image_tests.inl b/unit_tests/api/cl_enqueue_read_image_tests.inl index 8b0676e6fe..e9ed34cf2a 100644 --- a/unit_tests/api/cl_enqueue_read_image_tests.inl +++ b/unit_tests/api/cl_enqueue_read_image_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueReadImageTests; diff --git a/unit_tests/api/cl_enqueue_svm_free_tests.inl b/unit_tests/api/cl_enqueue_svm_free_tests.inl index 0d442e55c5..8f8eb72679 100644 --- a/unit_tests/api/cl_enqueue_svm_free_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_free_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMFreeTests; diff --git a/unit_tests/api/cl_enqueue_svm_map_tests.inl b/unit_tests/api/cl_enqueue_svm_map_tests.inl index da1e5e2eef..801cb2a9d4 100644 --- a/unit_tests/api/cl_enqueue_svm_map_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_map_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMMapTests; diff --git a/unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl b/unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl index 2d222998d9..71a7c67863 100644 --- a/unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_mem_fill_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMMemFillTests; diff --git a/unit_tests/api/cl_enqueue_svm_memcpy_tests.inl b/unit_tests/api/cl_enqueue_svm_memcpy_tests.inl index 7715b00a82..460249e59d 100644 --- a/unit_tests/api/cl_enqueue_svm_memcpy_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_memcpy_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMMemcpyTests; diff --git a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp index cb5a98dd90..98b066b73b 100644 --- a/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/unit_tests/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -14,7 +14,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMMigrateMemTests; diff --git a/unit_tests/api/cl_enqueue_svm_unmap_tests.inl b/unit_tests/api/cl_enqueue_svm_unmap_tests.inl index 7ff6bf2482..706adc2c47 100644 --- a/unit_tests/api/cl_enqueue_svm_unmap_tests.inl +++ b/unit_tests/api/cl_enqueue_svm_unmap_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueSVMUnmapTests; diff --git a/unit_tests/api/cl_enqueue_task_tests.inl b/unit_tests/api/cl_enqueue_task_tests.inl index 3533e55782..3f89fe6e14 100644 --- a/unit_tests/api/cl_enqueue_task_tests.inl +++ b/unit_tests/api/cl_enqueue_task_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueTaskTests; diff --git a/unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl b/unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl index dd862c758a..69682dcd4a 100644 --- a/unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl +++ b/unit_tests/api/cl_enqueue_unmap_mem_object_tests.inl @@ -11,7 +11,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueUnmapMemObjTests; diff --git a/unit_tests/api/cl_enqueue_verify_memory.inl b/unit_tests/api/cl_enqueue_verify_memory.inl index aa3047b956..844969ccda 100644 --- a/unit_tests/api/cl_enqueue_verify_memory.inl +++ b/unit_tests/api/cl_enqueue_verify_memory.inl @@ -11,7 +11,7 @@ #include "unit_tests/api/cl_api_tests.h" #include "unit_tests/mocks/mock_csr.h" -using namespace OCLRT; +using namespace NEO; TEST(CheckVerifyMemoryRelatedApiConstants, givenVerifyMemoryRelatedApiConstantsWhenVerifyingTheirValueThenCorrectValuesAreReturned) { EXPECT_EQ(AubMemDump::CmdServicesMemTraceMemoryCompare::CompareOperationValues::CompareEqual, CL_MEM_COMPARE_EQUAL); diff --git a/unit_tests/api/cl_enqueue_wait_for_events_tests.inl b/unit_tests/api/cl_enqueue_wait_for_events_tests.inl index 59571a24d9..1e482b7e9f 100644 --- a/unit_tests/api/cl_enqueue_wait_for_events_tests.inl +++ b/unit_tests/api/cl_enqueue_wait_for_events_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; using clEnqueueWaitForEventsTests = api_tests; diff --git a/unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl b/unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl index c0aafdaa53..daf725dd5c 100644 --- a/unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl +++ b/unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueWriteBufferRectTests; diff --git a/unit_tests/api/cl_enqueue_write_buffer_tests.inl b/unit_tests/api/cl_enqueue_write_buffer_tests.inl index 8dae862376..799c482ead 100644 --- a/unit_tests/api/cl_enqueue_write_buffer_tests.inl +++ b/unit_tests/api/cl_enqueue_write_buffer_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueWriteBufferTests; diff --git a/unit_tests/api/cl_enqueue_write_image_tests.inl b/unit_tests/api/cl_enqueue_write_image_tests.inl index e201e2a2b0..c22550a338 100644 --- a/unit_tests/api/cl_enqueue_write_image_tests.inl +++ b/unit_tests/api/cl_enqueue_write_image_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueWriteImageTests; diff --git a/unit_tests/api/cl_finish_tests.inl b/unit_tests/api/cl_finish_tests.inl index 6f13b32d7f..6b5833d4f2 100644 --- a/unit_tests/api/cl_finish_tests.inl +++ b/unit_tests/api/cl_finish_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clFinishTests; diff --git a/unit_tests/api/cl_flush_tests.inl b/unit_tests/api/cl_flush_tests.inl index c88f51f67c..90cf55edff 100644 --- a/unit_tests/api/cl_flush_tests.inl +++ b/unit_tests/api/cl_flush_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clFlushTests; diff --git a/unit_tests/api/cl_get_context_info_tests.inl b/unit_tests/api/cl_get_context_info_tests.inl index f388f08814..9f8a0b13d9 100644 --- a/unit_tests/api/cl_get_context_info_tests.inl +++ b/unit_tests/api/cl_get_context_info_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetContextInfoTests; diff --git a/unit_tests/api/cl_get_device_and_host_timer.inl b/unit_tests/api/cl_get_device_and_host_timer.inl index 11c905c97a..d24be197bd 100644 --- a/unit_tests/api/cl_get_device_and_host_timer.inl +++ b/unit_tests/api/cl_get_device_and_host_timer.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct FailOSTime : public MockOSTime { public: diff --git a/unit_tests/api/cl_get_device_ids_tests.inl b/unit_tests/api/cl_get_device_ids_tests.inl index de95e32fce..357286b4d4 100644 --- a/unit_tests/api/cl_get_device_ids_tests.inl +++ b/unit_tests/api/cl_get_device_ids_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetDeviceIDsTests; @@ -97,8 +97,8 @@ TEST_F(clGetDeviceIDsTests, GivenDeviceTypeCpuWhenGettingDeviceIdsThenDeviceNotF } } // namespace ULT -namespace OCLRT { +namespace NEO { extern bool overrideDeviceWithDefaultHardwareInfo; extern bool overrideCommandStreamReceiverCreation; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/api/cl_get_device_info_tests.inl b/unit_tests/api/cl_get_device_info_tests.inl index 3b5d21c387..bb5f74ff61 100644 --- a/unit_tests/api/cl_get_device_info_tests.inl +++ b/unit_tests/api/cl_get_device_info_tests.inl @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetDeviceInfoTests; diff --git a/unit_tests/api/cl_get_event_profiling_info_tests.inl b/unit_tests/api/cl_get_event_profiling_info_tests.inl index 282bfcefbf..ff1771bc91 100644 --- a/unit_tests/api/cl_get_event_profiling_info_tests.inl +++ b/unit_tests/api/cl_get_event_profiling_info_tests.inl @@ -15,7 +15,7 @@ #include "unit_tests/mocks/mock_event.h" #include "unit_tests/os_interface/mock_performance_counters.h" -using namespace OCLRT; +using namespace NEO; template class EventFixture : public api_fixture, public T { diff --git a/unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl b/unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl index 6c5d2bc96c..16a87c95b5 100644 --- a/unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl +++ b/unit_tests/api/cl_get_extension_function_address_for_platform_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetExtensionFunctionAddressForPlatformTests; diff --git a/unit_tests/api/cl_get_extension_function_address_tests.inl b/unit_tests/api/cl_get_extension_function_address_tests.inl index 9ce9daa7c2..2638728044 100644 --- a/unit_tests/api/cl_get_extension_function_address_tests.inl +++ b/unit_tests/api/cl_get_extension_function_address_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetExtensionFunctionAddressTests; diff --git a/unit_tests/api/cl_get_image_info_tests.inl b/unit_tests/api/cl_get_image_info_tests.inl index f48afc50b5..e66f74c9a0 100644 --- a/unit_tests/api/cl_get_image_info_tests.inl +++ b/unit_tests/api/cl_get_image_info_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_get_image_params_tests.inl b/unit_tests/api/cl_get_image_params_tests.inl index cb3c5d2b40..559c40570e 100644 --- a/unit_tests/api/cl_get_image_params_tests.inl +++ b/unit_tests/api/cl_get_image_params_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_get_kernel_arg_info_tests.inl b/unit_tests/api/cl_get_kernel_arg_info_tests.inl index 4062062630..5e968e571d 100644 --- a/unit_tests/api/cl_get_kernel_arg_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_arg_info_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetKernelArgInfoTests; diff --git a/unit_tests/api/cl_get_kernel_info_tests.inl b/unit_tests/api/cl_get_kernel_info_tests.inl index 0afa611c84..428197555a 100644 --- a/unit_tests/api/cl_get_kernel_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_info_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetKernelInfoTests; diff --git a/unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl b/unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl index 32df49ebe8..8909116d16 100644 --- a/unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl +++ b/unit_tests/api/cl_get_kernel_sub_group_info_khr_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" -using namespace OCLRT; +using namespace NEO; struct KernelSubGroupInfoKhrFixture : HelloWorldFixture { typedef HelloWorldFixture ParentClass; diff --git a/unit_tests/api/cl_get_kernel_sub_group_info_tests.inl b/unit_tests/api/cl_get_kernel_sub_group_info_tests.inl index 94e5768ca7..e1a1603029 100644 --- a/unit_tests/api/cl_get_kernel_sub_group_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_sub_group_info_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" -using namespace OCLRT; +using namespace NEO; struct KernelSubGroupInfoFixture : HelloWorldFixture { typedef HelloWorldFixture ParentClass; diff --git a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl index f05b128f90..08c348fbfc 100644 --- a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct clGetKernelWorkGroupInfoTests : public api_fixture, public ::testing::TestWithParam { diff --git a/unit_tests/api/cl_get_mem_object_info_tests.inl b/unit_tests/api/cl_get_mem_object_info_tests.inl index 2689b80697..b5a0a3e4bb 100644 --- a/unit_tests/api/cl_get_mem_object_info_tests.inl +++ b/unit_tests/api/cl_get_mem_object_info_tests.inl @@ -14,7 +14,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetMemObjectInfoTests; diff --git a/unit_tests/api/cl_get_pipe_info_tests.inl b/unit_tests/api/cl_get_pipe_info_tests.inl index 346671c4c2..c13f041e00 100644 --- a/unit_tests/api/cl_get_pipe_info_tests.inl +++ b/unit_tests/api/cl_get_pipe_info_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetPipeInfoTests; diff --git a/unit_tests/api/cl_get_platform_ids_tests.inl b/unit_tests/api/cl_get_platform_ids_tests.inl index b8a440ecf0..5f7ad4f860 100644 --- a/unit_tests/api/cl_get_platform_ids_tests.inl +++ b/unit_tests/api/cl_get_platform_ids_tests.inl @@ -11,11 +11,11 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { extern bool getDevicesResult; -}; // namespace OCLRT +}; // namespace NEO typedef api_tests clGetPlatformIDsTests; diff --git a/unit_tests/api/cl_get_platform_ids_tests_mt.cpp b/unit_tests/api/cl_get_platform_ids_tests_mt.cpp index 5bb8c7cc87..37b34b59c8 100644 --- a/unit_tests/api/cl_get_platform_ids_tests_mt.cpp +++ b/unit_tests/api/cl_get_platform_ids_tests_mt.cpp @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetPlatformIDsMtTests; diff --git a/unit_tests/api/cl_get_platform_info_tests.inl b/unit_tests/api/cl_get_platform_info_tests.inl index 8f0f9fe7d0..9c24f9a0d5 100644 --- a/unit_tests/api/cl_get_platform_info_tests.inl +++ b/unit_tests/api/cl_get_platform_info_tests.inl @@ -14,7 +14,7 @@ #include "CL/cl_ext.h" #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct clGetPlatformInfoTests : public api_tests { void SetUp() override { diff --git a/unit_tests/api/cl_get_program_build_info_tests.inl b/unit_tests/api/cl_get_program_build_info_tests.inl index e641fc1fc1..609237ddbd 100644 --- a/unit_tests/api/cl_get_program_build_info_tests.inl +++ b/unit_tests/api/cl_get_program_build_info_tests.inl @@ -16,7 +16,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetProgramBuildInfoTests; diff --git a/unit_tests/api/cl_get_program_info_tests.inl b/unit_tests/api/cl_get_program_info_tests.inl index bcda5151a4..7d616d0d72 100644 --- a/unit_tests/api/cl_get_program_info_tests.inl +++ b/unit_tests/api/cl_get_program_info_tests.inl @@ -15,7 +15,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetProgramInfoTests; diff --git a/unit_tests/api/cl_get_supported_image_formats_tests.inl b/unit_tests/api/cl_get_supported_image_formats_tests.inl index f17decdbd1..e376bc0350 100644 --- a/unit_tests/api/cl_get_supported_image_formats_tests.inl +++ b/unit_tests/api/cl_get_supported_image_formats_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetSupportedImageFormatsTests; diff --git a/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl b/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl index 4808d84007..66a18af64a 100644 --- a/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/unit_tests/api/cl_icd_get_platform_ids_khr_tests.inl @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clIcdGetPlatformIDsKHRTests; diff --git a/unit_tests/api/cl_intel_accelerator_tests.inl b/unit_tests/api/cl_intel_accelerator_tests.inl index 045681e2ce..840d08c470 100644 --- a/unit_tests/api/cl_intel_accelerator_tests.inl +++ b/unit_tests/api/cl_intel_accelerator_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/context/context.h" #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_intel_motion_estimation.cpp b/unit_tests/api/cl_intel_motion_estimation.cpp index a3a931953b..695ee41d6b 100644 --- a/unit_tests/api/cl_intel_motion_estimation.cpp +++ b/unit_tests/api/cl_intel_motion_estimation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/context/context.h" #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_link_program_tests.inl b/unit_tests/api/cl_link_program_tests.inl index 7d38d86bc8..a1c85a7101 100644 --- a/unit_tests/api/cl_link_program_tests.inl +++ b/unit_tests/api/cl_link_program_tests.inl @@ -14,7 +14,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp index baf7ccb3e6..d0f946d0a9 100644 --- a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp @@ -19,7 +19,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; namespace clMemLocallyUncachedResourceTests { diff --git a/unit_tests/api/cl_release_command_queue_tests.inl b/unit_tests/api/cl_release_command_queue_tests.inl index 3ff33ee757..23619a88f7 100644 --- a/unit_tests/api/cl_release_command_queue_tests.inl +++ b/unit_tests/api/cl_release_command_queue_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace DeviceHostQueue { typedef ::testing::Types QueueTypes; diff --git a/unit_tests/api/cl_release_context_tests.inl b/unit_tests/api/cl_release_context_tests.inl index 1bf31948e1..04bd30403c 100644 --- a/unit_tests/api/cl_release_context_tests.inl +++ b/unit_tests/api/cl_release_context_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clReleaseContextTests; diff --git a/unit_tests/api/cl_release_event_tests.inl b/unit_tests/api/cl_release_event_tests.inl index 0cc66b0f97..a972dcc090 100644 --- a/unit_tests/api/cl_release_event_tests.inl +++ b/unit_tests/api/cl_release_event_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ClReleaseEventTests { template diff --git a/unit_tests/api/cl_release_kernel_tests.inl b/unit_tests/api/cl_release_kernel_tests.inl index a2ae59b2e1..752f03bba5 100644 --- a/unit_tests/api/cl_release_kernel_tests.inl +++ b/unit_tests/api/cl_release_kernel_tests.inl @@ -11,7 +11,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clReleaseKernelTests; diff --git a/unit_tests/api/cl_release_mem_obj_tests.inl b/unit_tests/api/cl_release_mem_obj_tests.inl index bb1a147798..5eb28d89a9 100644 --- a/unit_tests/api/cl_release_mem_obj_tests.inl +++ b/unit_tests/api/cl_release_mem_obj_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clReleaseMemObjectTests; diff --git a/unit_tests/api/cl_release_program_tests.inl b/unit_tests/api/cl_release_program_tests.inl index 6775574230..998bf95fe9 100644 --- a/unit_tests/api/cl_release_program_tests.inl +++ b/unit_tests/api/cl_release_program_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clReleaseProgramTests; diff --git a/unit_tests/api/cl_retain_mem_obj_tests.inl b/unit_tests/api/cl_retain_mem_obj_tests.inl index a303e506d4..55dc5b921c 100644 --- a/unit_tests/api/cl_retain_mem_obj_tests.inl +++ b/unit_tests/api/cl_retain_mem_obj_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clRetainMemObjectTests; diff --git a/unit_tests/api/cl_retain_release_command_queue_tests.inl b/unit_tests/api/cl_retain_release_command_queue_tests.inl index 918186ea13..a121641149 100644 --- a/unit_tests/api/cl_retain_release_command_queue_tests.inl +++ b/unit_tests/api/cl_retain_release_command_queue_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/context/context.h" #include "unit_tests/fixtures/device_host_queue_fixture.h" -using namespace OCLRT; +using namespace NEO; namespace DeviceHostQueue { typedef ::testing::Types QueueTypes; diff --git a/unit_tests/api/cl_retain_release_context_tests.inl b/unit_tests/api/cl_retain_release_context_tests.inl index 0687ff297c..f9f98f4981 100644 --- a/unit_tests/api/cl_retain_release_context_tests.inl +++ b/unit_tests/api/cl_retain_release_context_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clRetainReleaseContextTests; diff --git a/unit_tests/api/cl_retain_release_device_tests.inl b/unit_tests/api/cl_retain_release_device_tests.inl index f6d1d4a269..b1e25973b7 100644 --- a/unit_tests/api/cl_retain_release_device_tests.inl +++ b/unit_tests/api/cl_retain_release_device_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clRetainReleaseDeviceTests; diff --git a/unit_tests/api/cl_retain_release_sampler_tests.inl b/unit_tests/api/cl_retain_release_sampler_tests.inl index 6bae1eafb8..f2fc0e4948 100644 --- a/unit_tests/api/cl_retain_release_sampler_tests.inl +++ b/unit_tests/api/cl_retain_release_sampler_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clRetainReleaseSamplerTests; diff --git a/unit_tests/api/cl_set_default_device_command_queue_tests.inl b/unit_tests/api/cl_set_default_device_command_queue_tests.inl index e59ae8d846..7ce33a8e97 100644 --- a/unit_tests/api/cl_set_default_device_command_queue_tests.inl +++ b/unit_tests/api/cl_set_default_device_command_queue_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/cl_set_event_callback_tests.inl b/unit_tests/api/cl_set_event_callback_tests.inl index f6f2082403..da4ab35924 100644 --- a/unit_tests/api/cl_set_event_callback_tests.inl +++ b/unit_tests/api/cl_set_event_callback_tests.inl @@ -9,7 +9,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace ClSetEventCallbackTests { diff --git a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl index bd1c862b5b..a8b5e8cf65 100644 --- a/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/unit_tests/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; class KernelArgSvmFixture : public api_fixture, public DeviceFixture { public: diff --git a/unit_tests/api/cl_set_kernel_exec_info_tests.inl b/unit_tests/api/cl_set_kernel_exec_info_tests.inl index 2c9986dfee..6133eb4797 100644 --- a/unit_tests/api/cl_set_kernel_exec_info_tests.inl +++ b/unit_tests/api/cl_set_kernel_exec_info_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; class KernelExecInfoFixture : public api_fixture { protected: diff --git a/unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl b/unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl index e6552f3d41..a7af34ba37 100644 --- a/unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl +++ b/unit_tests/api/cl_set_mem_object_destructor_callback_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateBufferTests; diff --git a/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp b/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp index 7e708d162e..a272972533 100644 --- a/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp +++ b/unit_tests/api/cl_set_mem_object_destructor_callback_tests_mt.cpp @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateBufferTests; diff --git a/unit_tests/api/cl_set_performance_configuration_tests.inl b/unit_tests/api/cl_set_performance_configuration_tests.inl index 79119db135..a4776551d5 100644 --- a/unit_tests/api/cl_set_performance_configuration_tests.inl +++ b/unit_tests/api/cl_set_performance_configuration_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; struct clSetPerformanceConfigurationINTELTests : public DeviceInstrumentationFixture, public PerformanceCountersDeviceFixture, diff --git a/unit_tests/api/cl_svm_alloc_tests.inl b/unit_tests/api/cl_svm_alloc_tests.inl index 1b601cd255..545a013140 100644 --- a/unit_tests/api/cl_svm_alloc_tests.inl +++ b/unit_tests/api/cl_svm_alloc_tests.inl @@ -10,7 +10,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clSVMAllocTests; diff --git a/unit_tests/api/cl_svm_free_tests.inl b/unit_tests/api/cl_svm_free_tests.inl index 2e17f1af18..c891707b4b 100644 --- a/unit_tests/api/cl_svm_free_tests.inl +++ b/unit_tests/api/cl_svm_free_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clSVMFreeTests; diff --git a/unit_tests/api/cl_unload_compiler_tests.inl b/unit_tests/api/cl_unload_compiler_tests.inl index cccc68c5a2..55825dde49 100644 --- a/unit_tests/api/cl_unload_compiler_tests.inl +++ b/unit_tests/api/cl_unload_compiler_tests.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clUnloadCompilerTests; diff --git a/unit_tests/api/cl_unload_platform_compiler_tests.inl b/unit_tests/api/cl_unload_platform_compiler_tests.inl index 8871251d0c..d67224c454 100644 --- a/unit_tests/api/cl_unload_platform_compiler_tests.inl +++ b/unit_tests/api/cl_unload_platform_compiler_tests.inl @@ -9,7 +9,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clUnloadPlatformCompilerTests; diff --git a/unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp index 3b44f769b1..deda3244d2 100644 --- a/unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp +++ b/unit_tests/api/gl/cl_create_from_gl_buffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromGLBuffer_; diff --git a/unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp index 6fa1f5129b..5d2b99ae3f 100644 --- a/unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp +++ b/unit_tests/api/gl/cl_create_from_gl_renderbuffer_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromGLRenderbuffer_; diff --git a/unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp index f6c1907e28..1c87ba7619 100644 --- a/unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp +++ b/unit_tests/api/gl/cl_create_from_gl_texture2d_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromGLTexture2D_; diff --git a/unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp index f6f6d59d39..90464613aa 100644 --- a/unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp +++ b/unit_tests/api/gl/cl_create_from_gl_texture3d_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromGLTexture3D_; diff --git a/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp b/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp index 46118eac3c..fa46dc1228 100644 --- a/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp +++ b/unit_tests/api/gl/cl_create_from_gl_texture_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "unit_tests/api/cl_api_tests.h" #include "unit_tests/mocks/gl/mock_gl_sharing.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromGLTexture_; diff --git a/unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp b/unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp index cfce8783ff..69aeed3955 100644 --- a/unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp +++ b/unit_tests/api/gl/cl_enqueue_acquire_gl_objects_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueAcquireGLObjects_; diff --git a/unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp b/unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp index fb6d13daeb..ae8505ac95 100644 --- a/unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp +++ b/unit_tests/api/gl/cl_enqueue_release_gl_objects_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueReleaseGLObjects_; diff --git a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp b/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp index 03dbe76e54..2dc5af5dd7 100644 --- a/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_context_info_khr_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/api/cl_api_tests.h" #include "unit_tests/os_interface/windows/gl/gl_dll_helper.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetGLContextInfoKHR_; diff --git a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp index 558af2f1c7..ee59a66482 100644 --- a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp @@ -11,7 +11,7 @@ #include -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/api/gl/cl_get_gl_object_info_tests.cpp b/unit_tests/api/gl/cl_get_gl_object_info_tests.cpp index db2ee5c3c6..ee9fee2e19 100644 --- a/unit_tests/api/gl/cl_get_gl_object_info_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_object_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetGLObjectInfo_; diff --git a/unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp b/unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp index a7847eb07c..0e7cf3ba8c 100644 --- a/unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp +++ b/unit_tests/api/gl/cl_get_gl_texture_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetGLTextureInfo_; diff --git a/unit_tests/aub/aub_center_tests.cpp b/unit_tests/aub/aub_center_tests.cpp index fcd9877254..94b9e698f7 100644 --- a/unit_tests/aub/aub_center_tests.cpp +++ b/unit_tests/aub/aub_center_tests.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" #include "third_party/aub_stream/headers/modes.h" -using namespace OCLRT; +using namespace NEO; TEST(AubCenter, GivenUseAubStreamDebugVariableNotSetWhenAubCenterIsCreatedThenAubCenterDoesNotCreateAubManager) { DebugManagerStateRestore restorer; diff --git a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp index 5d5d09df1a..598ce4be06 100644 --- a/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/unit_tests/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" #include "third_party/aub_stream/headers/options.h" -using namespace OCLRT; +using namespace NEO; namespace aub_stream_stubs { extern uint16_t tbxServerPort; diff --git a/unit_tests/aub/aub_helper_tests.inl b/unit_tests/aub/aub_helper_tests.inl index 96814077a8..6178587f3f 100644 --- a/unit_tests/aub/aub_helper_tests.inl +++ b/unit_tests/aub/aub_helper_tests.inl @@ -18,7 +18,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(AubHelper, WhenGetMemTraceIsCalledWithZeroPDEntryBitsThenTraceNonLocalIsReturned) { int hint = AubHelper::getMemTrace(0u); diff --git a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp index a4189821a3..07d4d0b8ac 100644 --- a/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/unit_tests/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/mocks/mock_gmm.h" #include "unit_tests/mocks/mock_gmm_resource_info.h" -using namespace OCLRT; +using namespace NEO; typedef Test AubAllocDumpTests; diff --git a/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp b/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp index 2fda9e5c72..fa791c89a6 100644 --- a/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp +++ b/unit_tests/aub_stream_mocks/aub_stream_interface_mock.cpp @@ -7,8 +7,8 @@ #include "unit_tests/mocks/mock_aub_manager.h" -namespace OCLRT { +namespace NEO { aub_stream::AubManager *createAubManager(uint32_t productFamily, uint32_t devicesCount, uint64_t memoryBankSize, bool localMemorySupported, uint32_t streamMode) { return new MockAubManager(productFamily, devicesCount, memoryBankSize, localMemorySupported, streamMode); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/aub_tests_configuration.cpp b/unit_tests/aub_tests/aub_tests_configuration.cpp index 764b89b509..e7e025e665 100644 --- a/unit_tests/aub_tests/aub_tests_configuration.cpp +++ b/unit_tests/aub_tests/aub_tests_configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,10 +7,10 @@ #include "unit_tests/tests_configuration.h" -namespace OCLRT { +namespace NEO { // max time per single test iteration unsigned int ultIterationMaxTime = 180; bool useMockGmm = false; const char *executionDirectorySuffix = "_aub"; TestMode testMode = TestMode::AubTests; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h b/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h index 82f16e886d..e6f85d40f7 100644 --- a/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h +++ b/unit_tests/aub_tests/command_queue/command_enqueue_fixture.h @@ -15,7 +15,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" -namespace OCLRT { +namespace NEO { struct CommandEnqueueAUBFixture : public CommandEnqueueBaseFixture, public AUBCommandStreamFixture { @@ -30,4 +30,4 @@ struct CommandEnqueueAUBFixture : public CommandEnqueueBaseFixture, CommandEnqueueBaseFixture::TearDown(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp index d99195c4ad..7635a8e3be 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct CopyBufferHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp index 8a2d0ec240..f70560f51c 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct CopyBufferRectHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index c1e133b303..d22639edf7 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct AUBCopyImage : public CommandDeviceFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index e0da30e0fc..dd173ecae1 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct FillBufferHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index 32f28b0381..d954e32b42 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; // clang-format off struct FillImageParams { diff --git a/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 2367a14b59..4cb5ae86c7 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -18,7 +18,7 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "unit_tests/helpers/debug_manager_state_restore.h" -using namespace OCLRT; +using namespace NEO; extern const HardwareInfo **platformDevices; @@ -354,7 +354,7 @@ INSTANTIATE_TEST_CASE_P( struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture { void SetUp() override { - deviceClVersionSupport = OCLRT::platformDevices[0]->capabilityTable.clVersionSupport; + deviceClVersionSupport = NEO::platformDevices[0]->capabilityTable.clVersionSupport; if (deviceClVersionSupport < 20) { return; } diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp index ac930bf763..a02c28e24d 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_map_buffer_aub_tests.cpp @@ -10,7 +10,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct AUBMapBuffer : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index 0287a66c64..c97c17003f 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct MapImageParams { cl_mem_object_type imageType; diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index 8f9dea8966..e06c41fc0f 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct ReadBufferHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index 49b559e0ce..a8d5c856ba 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct ReadBufferRectHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index ff5551dbf0..4de3b89a66 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct ReadImageParams { cl_mem_object_type imageType; diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h index 6fe2775688..2f302e3132 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h +++ b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h @@ -13,7 +13,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct AUBImageUnaligned : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index b29abd7c2b..4990a24fb7 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct VerifyMemoryBufferHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index eebd1e953b..f8ac45e76f 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct TestOffset { size_t offset[3]; diff --git a/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp index a026532bb6..5e22582fd5 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/helpers/debug_manager_state_restore.h" -using namespace OCLRT; +using namespace NEO; struct TimestampPacketAubTests : public CommandEnqueueAUBFixture, public ::testing::Test { void SetUp() override { diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp index 0304e4d465..616dbbbd62 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct WriteBufferHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index 617e4c23ea..a79cc67929 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct WriteBufferRectHw : public CommandEnqueueAUBFixture, diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp index 6e21f74d58..0d76b00f2b 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp @@ -10,7 +10,7 @@ #include "runtime/memory_manager/allocations_list.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; template void AubWriteCopyReadBuffer::runTest() { diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h index 537cc128ed..f5df6d4d45 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h +++ b/unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h @@ -11,7 +11,7 @@ #include "runtime/mem_obj/buffer.h" #include "unit_tests/aub_tests/fixtures/aub_fixture.h" -using namespace OCLRT; +using namespace NEO; struct AubWriteCopyReadBuffer : public AUBFixture, public ::testing::Test { diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index a3f3df0f08..cb15b672c1 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct WriteImageParams { cl_mem_object_type imageType; diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp index 9a88dfa9b1..2f7143718b 100644 --- a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { void AUBCommandStreamFixture::SetUp(CommandQueue *pCmdQ) { ASSERT_NE(pCmdQ, nullptr); @@ -51,4 +51,4 @@ void AUBCommandStreamFixture::SetUp(CommandQueue *pCmdQ) { void AUBCommandStreamFixture::TearDown() { CommandStreamFixture::TearDown(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h index 95a3bf2a7b..a96803fc81 100644 --- a/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class AUBCommandStreamFixture : public CommandStreamFixture { @@ -105,4 +105,4 @@ class AUBCommandStreamFixture : public CommandStreamFixture { private: CommandQueue *commandQueue = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp b/unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp index c0f53358c7..9009e97f40 100644 --- a/unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/unit_tests/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -18,7 +18,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct AUBFixture : public AUBCommandStreamFixture, public CommandQueueFixture, diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp index ddd0458a3f..c346b490ce 100644 --- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -13,14 +13,14 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/mocks/mock_aub_csr.h" -using OCLRT::AUBCommandStreamReceiver; -using OCLRT::AUBCommandStreamReceiverHw; -using OCLRT::AUBFamilyMapper; -using OCLRT::DeviceFixture; -using OCLRT::EngineType; -using OCLRT::folderAUB; +using NEO::AUBCommandStreamReceiver; +using NEO::AUBCommandStreamReceiverHw; +using NEO::AUBFamilyMapper; +using NEO::DeviceFixture; +using NEO::EngineType; +using NEO::folderAUB; -std::string getAubFileName(const OCLRT::Device *pDevice, const std::string baseName) { +std::string getAubFileName(const NEO::Device *pDevice, const std::string baseName) { const auto pGtSystemInfo = pDevice->getHardwareInfo().pSysInfo; std::stringstream strfilename; uint32_t subSlicesPerSlice = pGtSystemInfo->SubSliceCount / pGtSystemInfo->SliceCount; @@ -86,7 +86,7 @@ HWTEST_F(AubMemDumpTests, reserveMaxAddress) { auto pAddress = static_cast(gAddress) & 0xFFFFFFFF; auto enableLocalMemory = HwHelper::get(hwInfo.pPlatform->eRenderCoreFamily).getEnableLocalMemory(hwInfo); - OCLRT::AubHelperHw aubHelperHw(enableLocalMemory); + NEO::AubHelperHw aubHelperHw(enableLocalMemory); AUB::reserveAddressPPGTT(aubFile, gAddress, 4096, pAddress, 7, aubHelperHw); aubFile.fileHandle.close(); @@ -108,7 +108,7 @@ HWTEST_F(AubMemDumpTests, DISABLED_writeVerifyOneBytePPGTT) { auto gAddress = reinterpret_cast(&byte); uint64_t physAddress = reinterpret_cast(&byte) & 0xFFFFFFFF; - OCLRT::AubHelperHw aubHelperHw(false); + NEO::AubHelperHw aubHelperHw(false); AUB::reserveAddressPPGTT(aubFile, gAddress, sizeof(byte), physAddress, 7, aubHelperHw); AUB::addMemoryWrite(aubFile, physAddress, &byte, sizeof(byte), AubMemDump::AddressSpaceValues::TraceNonlocal); aubFile.expectMemory(physAddress, &byte, sizeof(byte), AubMemDump::AddressSpaceValues::TraceNonlocal, @@ -156,7 +156,7 @@ HWTEST_F(AubMemDumpTests, writeVerifySevenBytesPPGTT) { auto gAddress = reinterpret_cast(bytes); auto physAddress = reinterpret_cast(bytes) & 0xFFFFFFFF; - OCLRT::AubHelperHw aubHelperHw(false); + NEO::AubHelperHw aubHelperHw(false); AUB::reserveAddressPPGTT(aubFile, gAddress, sizeof(bytes), physAddress, 7, aubHelperHw); AUB::addMemoryWrite(aubFile, physAddress, bytes, sizeof(bytes), AubMemDump::AddressSpaceValues::TraceNonlocal); aubFile.expectMemory(physAddress, bytes, sizeof(bytes), AubMemDump::AddressSpaceValues::TraceNonlocal, diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h index 85b83ed751..b51d1a58d0 100644 --- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h @@ -20,17 +20,17 @@ namespace Os { extern const char *fileSeparator; } -extern std::string getAubFileName(const OCLRT::Device *pDevice, const std::string baseName); +extern std::string getAubFileName(const NEO::Device *pDevice, const std::string baseName); template -void setupAUB(const OCLRT::Device *pDevice, OCLRT::EngineType engineType) { - typedef typename OCLRT::AUBFamilyMapper::AUB AUB; - const auto &csTraits = OCLRT::CommandStreamReceiverSimulatedCommonHw::getCsTraits(engineType); +void setupAUB(const NEO::Device *pDevice, NEO::EngineType engineType) { + typedef typename NEO::AUBFamilyMapper::AUB AUB; + const auto &csTraits = NEO::CommandStreamReceiverSimulatedCommonHw::getCsTraits(engineType); auto mmioBase = csTraits.mmioBase; uint64_t physAddress = 0x10000; - OCLRT::AUBCommandStreamReceiver::AubFileStream aubFile; - std::string filePath(OCLRT::folderAUB); + NEO::AUBCommandStreamReceiver::AubFileStream aubFile; + std::string filePath(NEO::folderAUB); filePath.append(Os::fileSeparator); std::string baseName("simple"); baseName.append(csTraits.name); diff --git a/unit_tests/aub_tests/fixtures/aub_fixture.cpp b/unit_tests/aub_tests/fixtures/aub_fixture.cpp index 5d5d5e37b8..cb85e43c2a 100644 --- a/unit_tests/aub_tests/fixtures/aub_fixture.cpp +++ b/unit_tests/aub_tests/fixtures/aub_fixture.cpp @@ -11,7 +11,7 @@ #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { GraphicsAllocation *AUBFixture::createHostPtrAllocationFromSvmPtr(void *svmPtr, size_t size) { GraphicsAllocation *allocation = csr->getMemoryManager()->allocateGraphicsMemoryWithProperties(MockAllocationProperties{false, size}, svmPtr); @@ -22,4 +22,4 @@ GraphicsAllocation *AUBFixture::createHostPtrAllocationFromSvmPtr(void *svmPtr, return allocation; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/fixtures/aub_fixture.h b/unit_tests/aub_tests/fixtures/aub_fixture.h index 7cb5e090d5..fc178b27f5 100644 --- a/unit_tests/aub_tests/fixtures/aub_fixture.h +++ b/unit_tests/aub_tests/fixtures/aub_fixture.h @@ -20,7 +20,7 @@ #include -namespace OCLRT { +namespace NEO { class AUBFixture : public CommandQueueHwFixture { public: @@ -106,7 +106,7 @@ class AUBFixture : public CommandQueueHwFixture { private: using CommandQueueHwFixture::SetUp; -}; // namespace OCLRT +}; // namespace NEO template struct KernelAUBFixture : public AUBFixture, @@ -121,4 +121,4 @@ struct KernelAUBFixture : public AUBFixture, AUBFixture::TearDown(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h b/unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h index 7a14946321..1d8d6cf138 100644 --- a/unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h +++ b/unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h @@ -1,30 +1,15 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_kernel_fixture.h" -namespace OCLRT { +namespace NEO { static const char programFile[] = "simple_block_kernel"; static const char kernelName[] = "kernel_reflection"; @@ -53,4 +38,4 @@ class AUBParentKernelFixture : public CommandEnqueueAUBFixture, CommandEnqueueAUBFixture::TearDown(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/fixtures/fixture_tests.cpp b/unit_tests/aub_tests/fixtures/fixture_tests.cpp index 68d036970d..6ad733add8 100644 --- a/unit_tests/aub_tests/fixtures/fixture_tests.cpp +++ b/unit_tests/aub_tests/fixtures/fixture_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct SimpleTest : public CommandDeviceFixture, public AUBCommandStreamFixture, diff --git a/unit_tests/aub_tests/fixtures/hello_world_fixture.h b/unit_tests/aub_tests/fixtures/hello_world_fixture.h index dc11e8a903..f82e2b25a2 100644 --- a/unit_tests/aub_tests/fixtures/hello_world_fixture.h +++ b/unit_tests/aub_tests/fixtures/hello_world_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/fixtures/simple_arg_fixture.h" -namespace OCLRT { +namespace NEO { //////////////////////////////////////////////////////////////////////////////// // Factory where all command stream traffic funnels to an AUB file @@ -19,4 +19,4 @@ namespace OCLRT { struct AUBHelloWorldFixtureFactory : public HelloWorldFixtureFactory { typedef AUBCommandStreamFixture CommandStreamFixture; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h index e383db25ba..004c4d3120 100644 --- a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h +++ b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h @@ -18,7 +18,7 @@ #include "unit_tests/global_environment.h" #include "unit_tests/helpers/test_files.h" -namespace OCLRT { +namespace NEO { //////////////////////////////////////////////////////////////////////////////// // Factory where all command stream traffic funnels to an AUB file @@ -82,4 +82,4 @@ class RunKernelFixture : public CommandEnqueueAUBFixture { return pProgram; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/fixtures/simple_arg_fixture.h b/unit_tests/aub_tests/fixtures/simple_arg_fixture.h index db6d17f101..098822b7c7 100644 --- a/unit_tests/aub_tests/fixtures/simple_arg_fixture.h +++ b/unit_tests/aub_tests/fixtures/simple_arg_fixture.h @@ -15,7 +15,7 @@ #include "unit_tests/fixtures/simple_arg_kernel_fixture.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" -namespace OCLRT { +namespace NEO { //////////////////////////////////////////////////////////////////////////////// // Factory where all command stream traffic funnels to an AUB file @@ -107,4 +107,4 @@ struct SimpleArgFixture : public FixtureFactory::IndirectHeapFixture, size_t sizeUserMemory; GraphicsAllocation *outBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp b/unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp index 28c803b157..fa4fae0559 100644 --- a/unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp +++ b/unit_tests/aub_tests/gen10/aub_tests_configuration_gen10.cpp @@ -8,6 +8,6 @@ #include "runtime/gen_common/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" -using namespace OCLRT; +using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.cpp b/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.cpp index e937a548b8..5667458cbd 100644 --- a/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.cpp +++ b/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.cpp @@ -9,10 +9,10 @@ #include "unit_tests/fixtures/device_fixture.h" -using Gen10AubBatchBufferTests = Test; +using Gen10AubBatchBufferTests = Test; static constexpr auto gpuBatchBufferAddr = 0x800400001000; // 48-bit GPU address GEN10TEST_F(Gen10AubBatchBufferTests, givenSimpleRCSWithBatchBufferWhenItHasMSBSetInGpuAddressThenAUBShouldBeSetupSuccessfully) { - setupAUBWithBatchBuffer(pDevice, OCLRT::EngineType::ENGINE_RCS, gpuBatchBufferAddr); + setupAUBWithBatchBuffer(pDevice, NEO::EngineType::ENGINE_RCS, gpuBatchBufferAddr); } diff --git a/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.h b/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.h index 5febcb5471..6fb16f9a0e 100644 --- a/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.h +++ b/unit_tests/aub_tests/gen10/batch_buffer/aub_batch_buffer_tests_gen10.h @@ -10,14 +10,14 @@ #include "unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h" template -void setupAUBWithBatchBuffer(const OCLRT::Device *pDevice, OCLRT::EngineType engineType, uint64_t gpuBatchBufferAddr) { - typedef typename OCLRT::AUBFamilyMapper::AUB AUB; - const auto &csTraits = OCLRT::AUBCommandStreamReceiverHw::getCsTraits(engineType); +void setupAUBWithBatchBuffer(const NEO::Device *pDevice, NEO::EngineType engineType, uint64_t gpuBatchBufferAddr) { + typedef typename NEO::AUBFamilyMapper::AUB AUB; + const auto &csTraits = NEO::AUBCommandStreamReceiverHw::getCsTraits(engineType); auto mmioBase = csTraits.mmioBase; uint64_t physAddress = 0x10000; - OCLRT::AUBCommandStreamReceiver::AubFileStream aubFile; - std::string filePath(OCLRT::folderAUB); + NEO::AUBCommandStreamReceiver::AubFileStream aubFile; + std::string filePath(NEO::folderAUB); filePath.append(Os::fileSeparator); std::string baseName("simple"); baseName.append(csTraits.name); @@ -53,7 +53,7 @@ void setupAUBWithBatchBuffer(const OCLRT::Device *pDevice, OCLRT::EngineType eng auto gpuBatchBuffer = static_cast(gpuBatchBufferAddr); physAddress += sizeBatchBuffer; - OCLRT::AubHelperHw aubHelperHw(false); + NEO::AubHelperHw aubHelperHw(false); AUB::reserveAddressPPGTT(aubFile, gpuBatchBuffer, sizeBatchBuffer, physBatchBuffer, 7, aubHelperHw); uint8_t batchBuffer[sizeBatchBuffer]; diff --git a/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp b/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp index a44f94d178..59dc25b7bb 100644 --- a/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp +++ b/unit_tests/aub_tests/gen10/execution_model/enqueue_parent_kernel_tests_gen10.cpp @@ -12,7 +12,7 @@ #include "unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef AUBParentKernelFixture GEN10AUBParentKernelFixture; diff --git a/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp index c394b4011f..8735553d36 100644 --- a/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/unit_tests/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -8,6 +8,6 @@ #include "runtime/gen_common/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" -using namespace OCLRT; +using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp b/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp index 0d65895f48..ae7a7a78b9 100644 --- a/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp +++ b/unit_tests/aub_tests/gen8/execution_model/enqueue_parent_kernel_tests_gen8.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef AUBParentKernelFixture GEN8AUBParentKernelFixture; diff --git a/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp index 2930a91283..6f4891db9f 100644 --- a/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/unit_tests/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -8,6 +8,6 @@ #include "runtime/gen_common/hw_cmds.h" #include "unit_tests/aub_tests/aub_tests_configuration.inl" -using namespace OCLRT; +using namespace NEO; template AubTestsConfig GetAubTestsConfig(); diff --git a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp b/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp index e0000d85fe..2dc62432a6 100644 --- a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp +++ b/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.cpp @@ -9,10 +9,10 @@ #include "unit_tests/fixtures/device_fixture.h" -using AubBatchBufferTests = Test; +using AubBatchBufferTests = Test; static constexpr auto gpuBatchBufferAddr = 0x800400001000ull; // 48-bit GPU address GEN9TEST_F(AubBatchBufferTests, givenSimpleRCSWithBatchBufferWhenItHasMSBSetInGpuAddressThenAUBShouldBeSetupSuccessfully) { - setupAUBWithBatchBuffer(pDevice, OCLRT::EngineType::ENGINE_RCS, gpuBatchBufferAddr); + setupAUBWithBatchBuffer(pDevice, NEO::EngineType::ENGINE_RCS, gpuBatchBufferAddr); } diff --git a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h index 26d8ae36b6..67fac8e4b2 100644 --- a/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h +++ b/unit_tests/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h @@ -10,14 +10,14 @@ #include "unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h" template -void setupAUBWithBatchBuffer(const OCLRT::Device *pDevice, OCLRT::EngineType engineType, uint64_t gpuBatchBufferAddr) { - typedef typename OCLRT::AUBFamilyMapper::AUB AUB; - const auto &csTraits = OCLRT::CommandStreamReceiverSimulatedCommonHw::getCsTraits(engineType); +void setupAUBWithBatchBuffer(const NEO::Device *pDevice, NEO::EngineType engineType, uint64_t gpuBatchBufferAddr) { + typedef typename NEO::AUBFamilyMapper::AUB AUB; + const auto &csTraits = NEO::CommandStreamReceiverSimulatedCommonHw::getCsTraits(engineType); auto mmioBase = csTraits.mmioBase; uint64_t physAddress = 0x10000; - OCLRT::AUBCommandStreamReceiver::AubFileStream aubFile; - std::string filePath(OCLRT::folderAUB); + NEO::AUBCommandStreamReceiver::AubFileStream aubFile; + std::string filePath(NEO::folderAUB); filePath.append(Os::fileSeparator); std::string baseName("simple"); baseName.append(csTraits.name); @@ -54,7 +54,7 @@ void setupAUBWithBatchBuffer(const OCLRT::Device *pDevice, OCLRT::EngineType eng auto gpuBatchBuffer = static_cast(gpuBatchBufferAddr); physAddress += sizeBatchBuffer; - OCLRT::AubHelperHw aubHelperHw(false); + NEO::AubHelperHw aubHelperHw(false); AUB::reserveAddressPPGTT(aubFile, gpuBatchBuffer, sizeBatchBuffer, physBatchBuffer, 7, aubHelperHw); uint8_t batchBuffer[sizeBatchBuffer]; diff --git a/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp b/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp index aa027e8c79..2f4afd7ad7 100644 --- a/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp +++ b/unit_tests/aub_tests/gen9/execution_model/enqueue_parent_kernel_tests_gen9.cpp @@ -12,7 +12,7 @@ #include "unit_tests/aub_tests/fixtures/aub_parent_kernel_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" -using namespace OCLRT; +using namespace NEO; GEN9TEST_F(AUBParentKernelFixture, EnqueueParentKernel) { if (pDevice->getSupportedClVersion() >= 20) { diff --git a/unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp b/unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp index b43da1eb9a..0f3be4e691 100644 --- a/unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp +++ b/unit_tests/aub_tests/gen9/skl/command_queue/run_kernel_aub_tests_skl.cpp @@ -8,7 +8,7 @@ #include "unit_tests/aub_tests/fixtures/run_kernel_fixture.h" #include "unit_tests/fixtures/two_walker_fixture.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp b/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp index a89f657709..a766494e7b 100644 --- a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -18,7 +18,7 @@ extern GFXCORE_FAMILY renderCoreFamily; -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 17; auto const elementSize = 4; //sizeof CL_RGBA * CL_UNORM_INT8 diff --git a/unit_tests/base_object_allocator.cpp b/unit_tests/base_object_allocator.cpp index ef6d5a9a8d..48512213e7 100644 --- a/unit_tests/base_object_allocator.cpp +++ b/unit_tests/base_object_allocator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -27,7 +27,7 @@ unsigned int numBaseObjects = 0; std::mutex numBaseObjectsMutex; -namespace OCLRT { +namespace NEO { template void *BaseObject::operator new(size_t sz) { @@ -71,4 +71,4 @@ template class BaseObject<_cl_mem>; template class BaseObject<_cl_platform_id>; template class BaseObject<_cl_program>; template class BaseObject<_cl_sampler>; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index 35bc6d828a..90f78bb389 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -36,7 +36,7 @@ #include -using namespace OCLRT; +using namespace NEO; class BuiltInTests : public BuiltInFixture, diff --git a/unit_tests/built_ins/sip_tests.cpp b/unit_tests/built_ins/sip_tests.cpp index d4abd36d53..edf296cdc2 100644 --- a/unit_tests/built_ins/sip_tests.cpp +++ b/unit_tests/built_ins/sip_tests.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace SipKernelTests { std::string getDebugSipKernelNameWithBitnessAndProductSuffix(std::string &base, const char *product) { diff --git a/unit_tests/command_queue/buffer_operations_fixture.h b/unit_tests/command_queue/buffer_operations_fixture.h index 205df066ed..1ca54b7ce1 100644 --- a/unit_tests/command_queue/buffer_operations_fixture.h +++ b/unit_tests/command_queue/buffer_operations_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueWriteBufferTypeTest : public CommandEnqueueFixture, public ::testing::Test { @@ -65,4 +65,4 @@ struct EnqueueWriteBufferTypeTest : public CommandEnqueueFixture, std::unique_ptr srcBuffer; std::unique_ptr zeroCopyBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h b/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h index 5af7c05847..648a4c03f4 100644 --- a/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h +++ b/unit_tests/command_queue/buffer_operations_withAsyncGPU_fixture.h @@ -11,7 +11,7 @@ #include "buffer_operations_fixture.h" -namespace OCLRT { +namespace NEO { struct AsyncGPUoperations : public EnqueueWriteBufferTypeTest { void SetUp() override { storeInitHWTag = initialHardwareTag; @@ -27,4 +27,4 @@ struct AsyncGPUoperations : public EnqueueWriteBufferTypeTest { protected: int storeInitHWTag; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/command_enqueue_fixture.h b/unit_tests/command_queue/command_enqueue_fixture.h index fce1e70a81..aa38cd3413 100644 --- a/unit_tests/command_queue/command_enqueue_fixture.h +++ b/unit_tests/command_queue/command_enqueue_fixture.h @@ -15,7 +15,7 @@ #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/mocks/mock_memory_manager.h" -namespace OCLRT { +namespace NEO { struct CommandDeviceFixture : public DeviceFixture, public CommandQueueHwFixture { @@ -92,4 +92,4 @@ struct NegativeFailAllocationCommandEnqueueBaseFixture : public CommandEnqueueBa MemoryManager *oldMemManager; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/command_queue_fixture.cpp b/unit_tests/command_queue/command_queue_fixture.cpp index eb547fcfb8..e1a390cdc4 100644 --- a/unit_tests/command_queue/command_queue_fixture.cpp +++ b/unit_tests/command_queue/command_queue_fixture.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { // Global table of create functions extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE]; @@ -106,4 +106,4 @@ void CommandQueueFixture::TearDown() { delete pCmdQ; pCmdQ = nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/command_queue_fixture.h b/unit_tests/command_queue/command_queue_fixture.h index ac23636809..54d895f0dc 100644 --- a/unit_tests/command_queue/command_queue_fixture.h +++ b/unit_tests/command_queue/command_queue_fixture.h @@ -12,7 +12,7 @@ #include "CL/cl.h" #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class Device; struct CommandQueueHwFixture { @@ -78,4 +78,4 @@ static const cl_command_queue_properties DefaultCommandQueueProperties[] = { 0, CL_QUEUE_PROFILING_ENABLE, }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp b/unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp index 68cafb5320..f3e8a42ca5 100644 --- a/unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp +++ b/unit_tests/command_queue/command_queue_flush_waitlist_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct CommandQueueSimpleTest : public DeviceFixture, diff --git a/unit_tests/command_queue/command_queue_hw_tests.cpp b/unit_tests/command_queue/command_queue_hw_tests.cpp index a3c0312812..068aaee79e 100644 --- a/unit_tests/command_queue/command_queue_hw_tests.cpp +++ b/unit_tests/command_queue/command_queue_hw_tests.cpp @@ -21,7 +21,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; struct CommandQueueHwTest : public DeviceFixture, @@ -678,7 +678,7 @@ void CloneMdi(MultiDispatchInfo &dst, const MultiDispatchInfo &src) { } struct MockBuilder : BuiltinDispatchInfoBuilder { - MockBuilder(OCLRT::BuiltIns &builtins) : BuiltinDispatchInfoBuilder(builtins) { + MockBuilder(NEO::BuiltIns &builtins) : BuiltinDispatchInfoBuilder(builtins) { } bool buildDispatchInfos(MultiDispatchInfo &d, const BuiltinOpParams &conf) const override { wasBuildDispatchInfosWithBuiltinOpParamsCalled = true; @@ -692,7 +692,7 @@ struct MockBuilder : BuiltinDispatchInfoBuilder { paramsReceived.offset = offset; wasBuildDispatchInfosWithKernelParamsCalled = true; - DispatchInfoBuilder dib; + DispatchInfoBuilder dib; dib.setKernel(paramsToUse.kernel); dib.setDispatchGeometry(dim, paramsToUse.gws, paramsToUse.elws, paramsToUse.offset); dib.bake(d); diff --git a/unit_tests/command_queue/command_queue_tests.cpp b/unit_tests/command_queue/command_queue_tests.cpp index 406913abd2..44bd5bafc9 100644 --- a/unit_tests/command_queue/command_queue_tests.cpp +++ b/unit_tests/command_queue/command_queue_tests.cpp @@ -37,7 +37,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct CommandQueueMemoryDevice : public MemoryManagementFixture, diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/unit_tests/command_queue/dispatch_walker_tests.cpp index e051d5b26e..99acdbeec8 100644 --- a/unit_tests/command_queue/dispatch_walker_tests.cpp +++ b/unit_tests/command_queue/dispatch_walker_tests.cpp @@ -27,7 +27,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; struct DispatchWalkerTest : public CommandQueueFixture, public DeviceFixture, public ::testing::Test { diff --git a/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp b/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp index d8ae83f607..031de66003 100644 --- a/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp +++ b/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWTEST_F(AsyncGPUoperations, MapBufferAfterWriteBuffer) { diff --git a/unit_tests/command_queue/enqueue_barrier_tests.cpp b/unit_tests/command_queue/enqueue_barrier_tests.cpp index a5b75de33a..bd483dbae4 100644 --- a/unit_tests/command_queue/enqueue_barrier_tests.cpp +++ b/unit_tests/command_queue/enqueue_barrier_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -using namespace OCLRT; +using namespace NEO; struct BarrierTest : public CommandEnqueueFixture, public ::testing::Test { @@ -265,7 +265,7 @@ HWTEST_F(BarrierTest, givenEmptyCommandStreamAndBlockedBarrierCommandWhenUserEve EXPECT_EQ(CL_SUCCESS, retVal); // Consume all memory except what is needed for this enqueue - size_t barrierCmdStreamSize = OCLRT::EnqueueOperation::getSizeRequiredCS(CL_COMMAND_BARRIER, false, false, *pCmdQ, nullptr); + size_t barrierCmdStreamSize = NEO::EnqueueOperation::getSizeRequiredCS(CL_COMMAND_BARRIER, false, false, *pCmdQ, nullptr); commandStream.getSpace(commandStream.getMaxAvailableSpace() - barrierCmdStreamSize); //now trigger event diff --git a/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp index 9d548c0da1..1fcbe7a287 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_event_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest EnqueueCopyBuffer; diff --git a/unit_tests/command_queue/enqueue_copy_buffer_fixture.h b/unit_tests/command_queue/enqueue_copy_buffer_fixture.h index 58568a234d..f7524d6bab 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_fixture.h +++ b/unit_tests/command_queue/enqueue_copy_buffer_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueCopyBufferHelper { cl_int enqueueCopyBuffer( @@ -90,4 +90,4 @@ struct EnqueueCopyBufferTest : public CommandEnqueueFixture, Buffer *srcBuffer; Buffer *dstBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h b/unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h index 50617ce328..6b868c8cad 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/unit_tests/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueCopyBufferRectHelper { cl_int enqueueCopyBufferRect( @@ -135,4 +135,4 @@ struct EnqueueCopyBufferRectTest : public CommandEnqueueFixture, static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp index 493107d12e..2a60c2facc 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -15,7 +15,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; const size_t EnqueueCopyBufferRectTest::BufferRect::sizeInBytes = 100 * 100 * 100 * sizeof(cl_char); diff --git a/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp index ddd2dce719..4d66351bbb 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_tests.cpp @@ -20,7 +20,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueCopyBufferTest, null_src_mem_object) { auto dstBuffer = std::unique_ptr(BufferHelper<>::create()); diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h b/unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h index 87e7d252e0..a919fe8e44 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueCopyBufferToImageTest : public CommandEnqueueFixture, public ::testing::Test { @@ -81,4 +81,4 @@ struct EnqueueCopyBufferToImageMipMapTest : public CommandEnqueueFixture, Buffer *srcBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp index 1e22c70f33..7f1240850a 100644 --- a/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyBufferToImageTest, gpgpuWalker) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; @@ -200,7 +200,7 @@ HWTEST_P(MipMapCopyBufferToImageTest, GivenImageWithMipLevelNonZeroWhenCopyBuffe EBuiltInOps::CopyBufferToImage3d, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); cl_int retVal = CL_SUCCESS; cl_image_desc imageDesc = {}; diff --git a/unit_tests/command_queue/enqueue_copy_image_fixture.h b/unit_tests/command_queue/enqueue_copy_image_fixture.h index c68b63ce81..5cbbf03a94 100644 --- a/unit_tests/command_queue/enqueue_copy_image_fixture.h +++ b/unit_tests/command_queue/enqueue_copy_image_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueCopyImageTest : public CommandEnqueueFixture, public ::testing::Test { @@ -69,4 +69,4 @@ struct EnqueueCopyImageMipMapTest : public CommandEnqueueFixture, MockContext *context; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_copy_image_tests.cpp b/unit_tests/command_queue/enqueue_copy_image_tests.cpp index 3e6e0c1a7e..c2316cb726 100644 --- a/unit_tests/command_queue/enqueue_copy_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_image_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageTest, gpgpuWalker) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; @@ -209,7 +209,7 @@ HWTEST_P(MipMapCopyImageTest, GivenImagesWithNonZeroMipLevelsWhenCopyImageIsCall EBuiltInOps::CopyImageToImage3d, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); cl_int retVal = CL_SUCCESS; cl_image_desc srcImageDesc = {}; diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h b/unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h index b085dcaf80..ab322a9b0d 100644 --- a/unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueCopyImageToBufferTest : public CommandEnqueueFixture, public ::testing::Test { @@ -79,4 +79,4 @@ struct EnqueueCopyImageToBufferMipMapTest : public CommandEnqueueFixture, MockContext *context; Buffer *dstBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 75ecff7002..b61db291cb 100644 --- a/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueCopyImageToBufferTest, gpgpuWalker) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; @@ -201,7 +201,7 @@ HWTEST_P(MipMapCopyImageToBufferTest, GivenImageWithMipLevelNonZeroWhenCopyImage EBuiltInOps::CopyImage3dToBuffer, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); cl_int retVal = CL_SUCCESS; cl_image_desc imageDesc = {}; diff --git a/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp b/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp index b17e6ecb26..41baa875b5 100644 --- a/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp +++ b/unit_tests/command_queue/enqueue_debug_kernel_tests.cpp @@ -21,7 +21,7 @@ #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; typedef EnqueueHandlerTest EnqueueDebugKernelSimpleTest; diff --git a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp index 314c8251ba..5762588aeb 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_event_tests.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/command_queue/enqueue_fill_buffer_fixture.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/command_queue/enqueue_fill_buffer_fixture.h b/unit_tests/command_queue/enqueue_fill_buffer_fixture.h index 76f404b237..a392fef360 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_fixture.h +++ b/unit_tests/command_queue/enqueue_fill_buffer_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "unit_tests/mocks/mock_context.h" -namespace OCLRT { +namespace NEO { struct EnqueueFillBufferFixture : public CommandEnqueueFixture { @@ -46,4 +46,4 @@ struct EnqueueFillBufferFixture : public CommandEnqueueFixture { MockContext context; Buffer *buffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp index 8494ed5d24..3570ddccea 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp index d1877d46f2..d2d5f515a4 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp @@ -23,7 +23,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; typedef Test EnqueueFillBufferCmdTests; diff --git a/unit_tests/command_queue/enqueue_fill_image_fixture.h b/unit_tests/command_queue/enqueue_fill_image_fixture.h index 6013b724fd..0d80ef6a75 100644 --- a/unit_tests/command_queue/enqueue_fill_image_fixture.h +++ b/unit_tests/command_queue/enqueue_fill_image_fixture.h @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { @@ -43,4 +43,4 @@ struct EnqueueFillImageTestFixture : public CommandEnqueueFixture { MockContext *context; Image *image; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_fill_image_tests.cpp b/unit_tests/command_queue/enqueue_fill_image_tests.cpp index 29ed8c7fb5..dfdbbaf8ac 100644 --- a/unit_tests/command_queue/enqueue_fill_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_image_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; class EnqueueFillImageTest : public EnqueueFillImageTestFixture, public ::testing::Test { diff --git a/unit_tests/command_queue/enqueue_fixture.h b/unit_tests/command_queue/enqueue_fixture.h index f3cbebc341..83ba2b8348 100644 --- a/unit_tests/command_queue/enqueue_fixture.h +++ b/unit_tests/command_queue/enqueue_fixture.h @@ -32,8 +32,8 @@ struct EnqueueCopyBufferTraits : public EnqueueTraits { template struct EnqueueCopyBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueCopyBuffer(CommandQueue *pCmdQ, Buffer *srcBuffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -72,9 +72,9 @@ struct EnqueueCopyBufferToImageTraits : public EnqueueTraits { template struct EnqueueCopyBufferToImageHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueCopyBufferToImage(CommandQueue *pCmdQ, Buffer *srcBuffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -120,9 +120,9 @@ struct EnqueueCopyImageToBufferTraits : public EnqueueTraits { template struct EnqueueCopyImageToBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueCopyImageToBuffer(CommandQueue *pCmdQ, Image *srcImage = nullptr, @@ -168,8 +168,8 @@ struct EnqueueCopyImageTraits : public EnqueueTraits { template struct EnqueueCopyImageHelper { typedef T Traits; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueCopyImage(CommandQueue *pCmdQ, Image *srcImage = nullptr, @@ -218,8 +218,8 @@ struct EnqueueFillBufferTraits : public EnqueueTraits { template struct EnqueueFillBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueFillBuffer(CommandQueue *pCmdQ, Buffer *buffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -252,8 +252,8 @@ struct EnqueueFillImageTraits : public EnqueueTraits { template struct EnqueueFillImageHelper { typedef T Traits; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueFillImage(CommandQueue *pCmdQ, Image *image = nullptr, @@ -298,8 +298,8 @@ struct EnqueueKernelTraits : public EnqueueTraits { template struct EnqueueKernelHelper { typedef T Traits; - using CommandQueue = OCLRT::CommandQueue; - using Kernel = OCLRT::Kernel; + using CommandQueue = NEO::CommandQueue; + using Kernel = NEO::Kernel; static cl_int enqueueKernel(CommandQueue *pCmdQ, Kernel *kernel, @@ -334,8 +334,8 @@ struct EnqueueMapBufferTraits : public EnqueueTraits { template struct EnqueueMapBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static void *enqueueMapBuffer(CommandQueue *pCmdQ, Buffer *buffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -395,8 +395,8 @@ struct EnqueueReadBufferTraits : public EnqueueTraits { template struct EnqueueReadBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueReadBuffer(CommandQueue *pCmdQ, Buffer *buffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -443,8 +443,8 @@ struct EnqueueReadImageTraits : public EnqueueTraits { template struct EnqueueReadImageHelper { typedef T Traits; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueReadImage(CommandQueue *pCmdQ, Image *image = nullptr, @@ -495,8 +495,8 @@ struct EnqueueWriteBufferTraits : public EnqueueTraits { template struct EnqueueWriteBufferHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueWriteBuffer(CommandQueue *pCmdQ, Buffer *buffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -547,8 +547,8 @@ struct EnqueueWriteBufferRectTraits : public EnqueueTraits { template struct EnqueueWriteBufferRectHelper { typedef T Traits; - using Buffer = OCLRT::Buffer; - using CommandQueue = OCLRT::CommandQueue; + using Buffer = NEO::Buffer; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueWriteBufferRect(CommandQueue *pCmdQ, Buffer *buffer = std::unique_ptr(BufferHelper<>::create()).get(), @@ -599,8 +599,8 @@ struct EnqueueWriteImageTraits : public EnqueueTraits { template struct EnqueueWriteImageHelper { typedef T Traits; - using Image = OCLRT::Image; - using CommandQueue = OCLRT::CommandQueue; + using Image = NEO::Image; + using CommandQueue = NEO::CommandQueue; static cl_int enqueueWriteImage(CommandQueue *pCmdQ, Image *image = nullptr, diff --git a/unit_tests/command_queue/enqueue_handler_tests.cpp b/unit_tests/command_queue/enqueue_handler_tests.cpp index f0b7068f57..b3c4d81ec9 100644 --- a/unit_tests/command_queue/enqueue_handler_tests.cpp +++ b/unit_tests/command_queue/enqueue_handler_tests.cpp @@ -18,7 +18,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_mdi.h" -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueHandlerTest, enqueueHandlerWithKernelCallsProcessEvictionOnCSR) { int32_t tag; diff --git a/unit_tests/command_queue/enqueue_kernel_1_tests.cpp b/unit_tests/command_queue/enqueue_kernel_1_tests.cpp index 028e492fdb..5922ddd500 100644 --- a/unit_tests/command_queue/enqueue_kernel_1_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_1_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; typedef Test EnqueueKernelTest; diff --git a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp index a8f6ab34d3..9362896c28 100644 --- a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp @@ -21,7 +21,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; struct TestParam2 { cl_uint ScratchSize; diff --git a/unit_tests/command_queue/enqueue_kernel_event_tests.cpp b/unit_tests/command_queue/enqueue_kernel_event_tests.cpp index 3e4718b501..5bfd6aad15 100644 --- a/unit_tests/command_queue/enqueue_kernel_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_event_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest EventTests; TEST_F(EventTests, eventShouldBeReturned) { diff --git a/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp b/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp index a66a6a4492..fc3cc3fc38 100644 --- a/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_global_offset_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest GlobalWorkOffset; TEST_F(GlobalWorkOffset, nullPointer) { diff --git a/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp b/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp index 3bbbfaeed1..af9a0f4a9a 100644 --- a/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_local_work_size_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest EnqueueKernelLocalWorkSize; diff --git a/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp b/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp index 30db103666..5770c2109e 100644 --- a/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_two_ioq_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/helpers/hw_parse.h" -using namespace OCLRT; +using namespace NEO; struct TwoIOQsTwoDependentWalkers : public HelloWorldTest, public HardwareParse { diff --git a/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp b/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp index 29106da118..438e73f0f7 100644 --- a/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_two_ooq_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/helpers/hw_parse.h" -using namespace OCLRT; +using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { typedef OOQueueFixture CommandQueueFixture; diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp b/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp index 4d72deb818..8f2183204c 100644 --- a/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_two_walker_ioq_tests.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/two_walker_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef TwoWalkerTest IOQWithTwoWalkers; diff --git a/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp b/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp index 0e5602da08..f7ba5604ed 100644 --- a/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_two_walker_ooq_tests.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/fixtures/two_walker_fixture.h" -using namespace OCLRT; +using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { typedef OOQueueFixture CommandQueueFixture; diff --git a/unit_tests/command_queue/enqueue_map_buffer_fixture.h b/unit_tests/command_queue/enqueue_map_buffer_fixture.h index dd27c8f589..f58c209d45 100644 --- a/unit_tests/command_queue/enqueue_map_buffer_fixture.h +++ b/unit_tests/command_queue/enqueue_map_buffer_fixture.h @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, public ::testing::Test { @@ -52,4 +52,4 @@ struct EnqueueMapBufferTypeTest : public CommandEnqueueFixture, Buffer *srcBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp index bf1fed09f2..762cc7659b 100644 --- a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp @@ -19,7 +19,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueMapBufferTest : public DeviceFixture, public CommandQueueHwFixture, diff --git a/unit_tests/command_queue/enqueue_map_image_tests.cpp b/unit_tests/command_queue/enqueue_map_image_tests.cpp index 4a0a98281f..8f5d06c332 100644 --- a/unit_tests/command_queue/enqueue_map_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_map_image_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueMapImageTest : public DeviceFixture, public CommandQueueHwFixture, diff --git a/unit_tests/command_queue/enqueue_marker_tests.cpp b/unit_tests/command_queue/enqueue_marker_tests.cpp index c5df97f528..1a0e4242f9 100644 --- a/unit_tests/command_queue/enqueue_marker_tests.cpp +++ b/unit_tests/command_queue/enqueue_marker_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -using namespace OCLRT; +using namespace NEO; struct MarkerFixture : public CommandEnqueueFixture { public: diff --git a/unit_tests/command_queue/enqueue_media_kernel.cpp b/unit_tests/command_queue/enqueue_media_kernel.cpp index a97ecda66b..afdaeb390c 100644 --- a/unit_tests/command_queue/enqueue_media_kernel.cpp +++ b/unit_tests/command_queue/enqueue_media_kernel.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/media_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp b/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp index 3359743cd0..be48bffd31 100644 --- a/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/unit_tests/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_buffer.h" -using namespace OCLRT; +using namespace NEO; class MigrateMemObjectsFixture : public DeviceFixture, diff --git a/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp index c730ad8cf2..64da5cddd8 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_event_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest EnqueueReadBuffer; diff --git a/unit_tests/command_queue/enqueue_read_buffer_fixture.h b/unit_tests/command_queue/enqueue_read_buffer_fixture.h index 6586170372..4598c6e86f 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_fixture.h +++ b/unit_tests/command_queue/enqueue_read_buffer_fixture.h @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueReadBufferTypeTest : public CommandEnqueueFixture, public ::testing::Test { @@ -51,4 +51,4 @@ struct EnqueueReadBufferTypeTest : public CommandEnqueueFixture, std::unique_ptr srcBuffer; std::unique_ptr nonZeroCopyBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h b/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h index 3b2820a23d..695470b1bd 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { @@ -89,4 +89,4 @@ struct EnqueueReadBufferRectTest : public CommandEnqueueFixture, static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp index d7bf6e98ea..191070d3f3 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -17,7 +17,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueReadBufferRectTest, null_src_mem_object) { auto retVal = CL_SUCCESS; diff --git a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp index 1963e0758f..dc6d0ca4b6 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_buffer_tests.cpp @@ -20,7 +20,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueReadBufferTypeTest, null_mem_object) { auto data = 1; diff --git a/unit_tests/command_queue/enqueue_read_image_fixture.h b/unit_tests/command_queue/enqueue_read_image_fixture.h index 2abfd2d5ac..b85f1f9d43 100644 --- a/unit_tests/command_queue/enqueue_read_image_fixture.h +++ b/unit_tests/command_queue/enqueue_read_image_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueReadImageTest : public CommandEnqueueFixture, public ::testing::Test { @@ -59,4 +59,4 @@ struct EnqueueReadImageTest : public CommandEnqueueFixture, struct EnqueueReadImageMipMapTest : public EnqueueReadImageTest, public ::testing::WithParamInterface { }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_read_image_tests.cpp b/unit_tests/command_queue/enqueue_read_image_tests.cpp index 7f20683a82..323112ee92 100644 --- a/unit_tests/command_queue/enqueue_read_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_read_image_tests.cpp @@ -17,7 +17,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueReadImageTest, gpgpuWalker) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; @@ -440,7 +440,7 @@ HWTEST_P(MipMapReadImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalled EBuiltInOps::CopyImage3dToBuffer, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); cl_int retVal = CL_SUCCESS; cl_image_desc imageDesc = {}; diff --git a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp index 86c1eda51b..3729090d16 100644 --- a/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueSvmMemCopyTest : public DeviceFixture, public CommandQueueHwFixture, @@ -63,7 +63,7 @@ HWTEST_F(EnqueueSvmMemCopyTest, givenEnqueueSVMMemcpyWhenUsingCopyBufferToBuffer EBuiltInOps::CopyBufferToBuffer, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); EXPECT_EQ(&origBuilder, oldBuilder.get()); // call enqueue on mock builder diff --git a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp index 0492d66037..9def5ed82d 100644 --- a/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_builtin_dispatch_info_builder.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueSvmMemFillTest : public DeviceFixture, public CommandQueueHwFixture, @@ -75,7 +75,7 @@ HWTEST_P(EnqueueSvmMemFillTest, givenEnqueueSVMMemFillWhenUsingFillBufferBuilder EBuiltInOps::FillBuffer, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockFillBufferBuilder(builtIns, &origBuilder, pattern, patternSize))); + std::unique_ptr(new MockFillBufferBuilder(builtIns, &origBuilder, pattern, patternSize))); EXPECT_EQ(&origBuilder, oldBuilder.get()); // call enqueue on mock builder diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index f9bc71dbbc..1dc05f585f 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -21,7 +21,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueSvmTest : public DeviceFixture, public CommandQueueHwFixture, diff --git a/unit_tests/command_queue/enqueue_thread_tests.cpp b/unit_tests/command_queue/enqueue_thread_tests.cpp index a351cb1c81..d64b0c60c7 100644 --- a/unit_tests/command_queue/enqueue_thread_tests.cpp +++ b/unit_tests/command_queue/enqueue_thread_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp b/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp index f95b2443ac..c43248c4d5 100644 --- a/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/unit_tests/command_queue/enqueue_unmap_memobject_tests.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct EnqueueUnmapMemObjTest : public DeviceFixture, public CommandQueueHwFixture, diff --git a/unit_tests/command_queue/enqueue_waitlist_tests.cpp b/unit_tests/command_queue/enqueue_waitlist_tests.cpp index 19d4d5dc03..16e38a2806 100644 --- a/unit_tests/command_queue/enqueue_waitlist_tests.cpp +++ b/unit_tests/command_queue/enqueue_waitlist_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -37,7 +37,7 @@ class clEventWrapper { cl_event mMem; }; -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp index bb3129f0b7..68ce6f665d 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_event_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST_F(EnqueueWriteBufferTypeTest, eventShouldBeReturned) { cl_bool blockingWrite = CL_TRUE; diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h b/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h index db83e74034..59f4d442d5 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, public ::testing::Test { @@ -91,4 +91,4 @@ struct EnqueueWriteBufferRectTest : public CommandEnqueueFixture, static const size_t rowPitch = 100; static const size_t slicePitch = 100 * 100; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp index 9a5fdea57f..0cdaad1eff 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_rect_tests.cpp @@ -17,7 +17,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueWriteBufferRectTest, nullBufferReturnsError) { auto retVal = CL_SUCCESS; diff --git a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp index 0c7549ba92..fa657e6b6b 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_buffer_tests.cpp @@ -19,7 +19,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWTEST_F(EnqueueWriteBufferTypeTest, null_mem_object) { auto data = 1; diff --git a/unit_tests/command_queue/enqueue_write_image_fixture.h b/unit_tests/command_queue/enqueue_write_image_fixture.h index 576b2f0898..a2675299ba 100644 --- a/unit_tests/command_queue/enqueue_write_image_fixture.h +++ b/unit_tests/command_queue/enqueue_write_image_fixture.h @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct EnqueueWriteImageTest : public CommandEnqueueFixture, public ::testing::Test { @@ -59,4 +59,4 @@ struct EnqueueWriteImageTest : public CommandEnqueueFixture, struct EnqueueWriteImageMipMapTest : public EnqueueWriteImageTest, public ::testing::WithParamInterface { }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_queue/enqueue_write_image_tests.cpp b/unit_tests/command_queue/enqueue_write_image_tests.cpp index 5e28a5b33a..e49cf30d0f 100644 --- a/unit_tests/command_queue/enqueue_write_image_tests.cpp +++ b/unit_tests/command_queue/enqueue_write_image_tests.cpp @@ -16,7 +16,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueWriteImageTest, gpgpuWalker) { typedef typename FamilyType::GPGPU_WALKER GPGPU_WALKER; @@ -378,7 +378,7 @@ HWTEST_P(MipMapWriteImageTest, GivenImageWithMipLevelNonZeroWhenReadImageIsCalle EBuiltInOps::CopyBufferToImage3d, pCmdQ->getContext(), pCmdQ->getDevice(), - std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); + std::unique_ptr(new MockBuiltinDispatchInfoBuilder(builtIns, &origBuilder))); cl_int retVal = CL_SUCCESS; cl_image_desc imageDesc = {}; diff --git a/unit_tests/command_queue/finish_tests.cpp b/unit_tests/command_queue/finish_tests.cpp index ae1904b430..f2524d1d21 100644 --- a/unit_tests/command_queue/finish_tests.cpp +++ b/unit_tests/command_queue/finish_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct FinishFixture : public DeviceFixture, public CommandQueueHwFixture, diff --git a/unit_tests/command_queue/flush_tests.cpp b/unit_tests/command_queue/flush_tests.cpp index a03ab03ee0..f5daa34115 100644 --- a/unit_tests/command_queue/flush_tests.cpp +++ b/unit_tests/command_queue/flush_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct FlushTest : public DeviceFixture, diff --git a/unit_tests/command_queue/get_command_queue_info_tests.cpp b/unit_tests/command_queue/get_command_queue_info_tests.cpp index 9064d96e7e..5be5324f42 100644 --- a/unit_tests/command_queue/get_command_queue_info_tests.cpp +++ b/unit_tests/command_queue/get_command_queue_info_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct GetCommandQueueInfoTest : public DeviceFixture, public ContextFixture, diff --git a/unit_tests/command_queue/get_size_required_buffer_tests.cpp b/unit_tests/command_queue/get_size_required_buffer_tests.cpp index 145d2cc943..60b983ee12 100644 --- a/unit_tests/command_queue/get_size_required_buffer_tests.cpp +++ b/unit_tests/command_queue/get_size_required_buffer_tests.cpp @@ -22,7 +22,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/fixtures/simple_arg_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; struct GetSizeRequiredBufferTest : public CommandEnqueueFixture, public SimpleArgKernelFixture, diff --git a/unit_tests/command_queue/get_size_required_image_tests.cpp b/unit_tests/command_queue/get_size_required_image_tests.cpp index 4c2b4eca40..dbd531f5c8 100644 --- a/unit_tests/command_queue/get_size_required_image_tests.cpp +++ b/unit_tests/command_queue/get_size_required_image_tests.cpp @@ -25,7 +25,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; struct GetSizeRequiredImageTest : public CommandEnqueueFixture, public ::testing::Test { diff --git a/unit_tests/command_queue/get_size_required_tests.cpp b/unit_tests/command_queue/get_size_required_tests.cpp index 43255c7b00..63b6f559c2 100644 --- a/unit_tests/command_queue/get_size_required_tests.cpp +++ b/unit_tests/command_queue/get_size_required_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct GetSizeRequiredTest : public CommandEnqueueFixture, public ::testing::Test { diff --git a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp index 7451d775d9..d3b7076216 100644 --- a/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp +++ b/unit_tests/command_queue/gl/enqueue_kernel_gl_tests.cpp @@ -20,7 +20,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldFixture EnqueueKernelFixture; typedef Test EnqueueKernelTest; diff --git a/unit_tests/command_queue/ioq_task_tests.cpp b/unit_tests/command_queue/ioq_task_tests.cpp index 06b16500f2..8c3794fd30 100644 --- a/unit_tests/command_queue/ioq_task_tests.cpp +++ b/unit_tests/command_queue/ioq_task_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest IOQ; diff --git a/unit_tests/command_queue/ioq_task_tests_mt.cpp b/unit_tests/command_queue/ioq_task_tests_mt.cpp index 62d2ecdb40..b8950a2c0c 100644 --- a/unit_tests/command_queue/ioq_task_tests_mt.cpp +++ b/unit_tests/command_queue/ioq_task_tests_mt.cpp @@ -1,23 +1,8 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "unit_tests/command_queue/enqueue_fixture.h" @@ -25,7 +10,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_buffer.h" -using namespace OCLRT; +using namespace NEO; typedef HelloWorldTest IOQTaskTestsMt; diff --git a/unit_tests/command_queue/local_id_tests.cpp b/unit_tests/command_queue/local_id_tests.cpp index 47d1c70bd4..fd3a417d8e 100644 --- a/unit_tests/command_queue/local_id_tests.cpp +++ b/unit_tests/command_queue/local_id_tests.cpp @@ -14,7 +14,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; TEST(LocalID, GRFsPerThread_SIMD8) { uint32_t simd = 8; diff --git a/unit_tests/command_queue/local_work_size_tests.cpp b/unit_tests/command_queue/local_work_size_tests.cpp index 39e0a0c025..6f22b56d4b 100644 --- a/unit_tests/command_queue/local_work_size_tests.cpp +++ b/unit_tests/command_queue/local_work_size_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual8WhenComputeCalledThenLocalGroupComputed) { //wsInfo maxWorkGroupSize, hasBariers, simdSize, slmTotalSize, coreFamily, numThreadsPerSubSlice, localMemorySize, imgUsed, yTiledSurface @@ -22,25 +22,25 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca size_t workGroup[3] = {6144, 1, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1536; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 333; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 9u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -52,19 +52,19 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc size_t workGroup[3] = {6144, 1, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 48u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 512; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -76,13 +76,13 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca size_t workGroup[3] = {384, 96, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 128u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); ; EXPECT_EQ(workGroupSize[1], 16u); @@ -90,7 +90,7 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca workGroup[0] = 12; workGroup[1] = 512; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 4u); EXPECT_EQ(workGroupSize[1], 64u); EXPECT_EQ(workGroupSize[2], 1u); @@ -104,27 +104,27 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc size_t workGroup[3] = {384, 96, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 128u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 12; workGroup[1] = 512; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 4u); EXPECT_EQ(workGroupSize[1], 64u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1; workGroup[1] = 384; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 1u); EXPECT_EQ(workGroupSize[1], 128u); EXPECT_EQ(workGroupSize[2], 1u); @@ -136,7 +136,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca size_t workGroup[3] = {384, 384, 384}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 128u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); @@ -144,7 +144,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca workGroup[0] = 96; workGroup[1] = 4; workGroup[2] = 4; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 2u); @@ -152,7 +152,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca workGroup[0] = 12; workGroup[1] = 512; workGroup[2] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 4u); EXPECT_EQ(workGroupSize[1], 64u); EXPECT_EQ(workGroupSize[2], 1u); @@ -160,18 +160,18 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca workGroup[0] = 2; workGroup[1] = 2; workGroup[2] = 3; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 3u); } TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLocalGroupComputed) { - OCLRT::WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->pPlatform->eRenderCoreFamily, 32u, 0u, false, false); + NEO::WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->pPlatform->eRenderCoreFamily, 32u, 0u, false, false); uint32_t workDim = 3; size_t workGroup[3] = {384, 384, 384}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 128u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); @@ -179,7 +179,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc workGroup[0] = 96; workGroup[1] = 6; workGroup[2] = 4; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 4u); @@ -187,7 +187,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc workGroup[0] = 12; workGroup[1] = 512; workGroup[2] = 48; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 4u); EXPECT_EQ(workGroupSize[1], 64u); EXPECT_EQ(workGroupSize[2], 1u); @@ -195,7 +195,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc workGroup[0] = 6; workGroup[1] = 4; workGroup[2] = 64; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 32u); @@ -203,7 +203,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc workGroup[0] = 113; workGroup[1] = 113; workGroup[2] = 113; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 113u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -218,7 +218,7 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSquaredAlgorithmWhenComputeCalledTh size_t workGroup[3] = {384, 96, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); @@ -233,7 +233,7 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSquaredAlgorithmOnWhenComputeCalled size_t workGroup[3] = {1024, 1, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -248,7 +248,7 @@ TEST(localWorkSizeTest, given2DdispatchWithImagesAndSquaredAlgorithmOnWhenLwsIsC size_t workGroup[3] = {256, 96, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); @@ -262,14 +262,14 @@ TEST(localWorkSizeTest, givenKernelWithTileYImagesAndBarrierWhenWorkgroupSizeIsC workGroup[0] = 2048; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 8u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1920; workGroup[1] = 1080; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 8u); EXPECT_EQ(workGroupSize[2], 1u); @@ -283,14 +283,14 @@ TEST(localWorkSizeTest, givenKernelWithTileYImagesAndNoBarriersWhenWorkgroupSize workGroup[0] = 2048; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1920; workGroup[1] = 1080; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); @@ -304,14 +304,14 @@ TEST(localWorkSizeTest, givenSimd16KernelWithTileYImagesAndNoBarriersWhenWorkgro workGroup[0] = 2048; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1920; workGroup[1] = 1080; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); @@ -325,7 +325,7 @@ TEST(localWorkSizeTest, givenKernelWithTwoDimensionalGlobalSizesWhenLwsIsCompute workGroup[0] = 1024; workGroup[1] = 1024; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -339,28 +339,28 @@ TEST(localWorkSizeTest, givenKernelWithBarriersAndTiledImagesWithYdimensionHighe workGroup[0] = 256; workGroup[1] = 1024; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 512; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 480; workGroup[1] = 1080; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 196; workGroup[1] = 30; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 49u); EXPECT_EQ(workGroupSize[1], 5u); EXPECT_EQ(workGroupSize[2], 1u); @@ -374,14 +374,14 @@ TEST(localWorkSizeTest, givenHighOneDimensionalGwsWhenLwsIsComputedThenMaxWorkgo workGroup[0] = 65536; workGroup[1] = 1; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 524288; workGroup[1] = 1; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -395,21 +395,21 @@ TEST(localWorkSizeTest, givenVeriousGwsSizesWithImagesWhenLwsIsComputedThenPrope workGroup[0] = 256; workGroup[1] = 1024; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 512; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 64u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 208; workGroup[1] = 2; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); @@ -417,7 +417,7 @@ TEST(localWorkSizeTest, givenVeriousGwsSizesWithImagesWhenLwsIsComputedThenPrope workGroup[0] = 6; workGroup[1] = 128; wsInfo.simdSize = 8; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 4u); EXPECT_EQ(workGroupSize[2], 1u); @@ -425,7 +425,7 @@ TEST(localWorkSizeTest, givenVeriousGwsSizesWithImagesWhenLwsIsComputedThenPrope workGroup[0] = 3; workGroup[1] = 128; wsInfo.simdSize = 8; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 1u); EXPECT_EQ(workGroupSize[1], 128u); EXPECT_EQ(workGroupSize[2], 1u); @@ -438,7 +438,7 @@ TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize16WhenLwsIsComputedThenMaxWorkg size_t workGroupSize[3]; workGroup[0] = 1048576; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, 1); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, 1); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -451,7 +451,7 @@ TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize8WhenLwsIsComputedThenMaxWorkgr size_t workGroupSize[3]; workGroup[0] = 1048576; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, 1); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, 1); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -465,14 +465,14 @@ TEST(localWorkSizeTest, givenKernelUtilizingImagesAndSlmWhenLwsIsBeingComputedTh workGroup[0] = 2048; workGroup[1] = 2048; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1920; workGroup[1] = 1080; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 8u); EXPECT_EQ(workGroupSize[2], 1u); @@ -486,21 +486,21 @@ TEST(localWorkSizeTest, useStrictRatio) { workGroup[0] = 194; workGroup[1] = 234; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 117u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 100; workGroup[1] = 100; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 20u); EXPECT_EQ(workGroupSize[1], 5u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 54; workGroup[1] = 154; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 27u); EXPECT_EQ(workGroupSize[1], 7u); EXPECT_EQ(workGroupSize[2], 1u); @@ -514,19 +514,19 @@ TEST(localWorkSizeTest, useBarriers) { workGroup[0] = 194; workGroup[1] = 234; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 97u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); wsInfo.yTiledSurfaces = false; wsInfo.imgUsed = false; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 78u); EXPECT_EQ(workGroupSize[2], 1u); - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 2u); EXPECT_EQ(workGroupSize[1], 78u); EXPECT_EQ(workGroupSize[2], 1u); @@ -538,42 +538,42 @@ TEST(localWorkSizeTest, given2DimWorkWhenComputeSquaredCalledThenLocalGroupCompu size_t workGroup[3] = {2048, 272, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 1024; workGroup[1] = 1024; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 16u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 512; workGroup[1] = 104; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 8u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 104; workGroup[1] = 512; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 8u); EXPECT_EQ(workGroupSize[1], 32u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 184; workGroup[1] = 368; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 8u); EXPECT_EQ(workGroupSize[1], 16u); EXPECT_EQ(workGroupSize[2], 1u); workGroup[0] = 113; workGroup[1] = 2; - OCLRT::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); + NEO::computeWorkgroupSizeSquared(wsInfo.maxWorkGroupSize, workGroupSize, workGroup, wsInfo.simdSize, workDim); EXPECT_EQ(workGroupSize[0], 113u); EXPECT_EQ(workGroupSize[1], 2u); EXPECT_EQ(workGroupSize[2], 1u); @@ -588,7 +588,7 @@ TEST(localWorkSizeTest, givenDeviceSupportingLws1024AndKernelCompiledInSimd8When size_t workGroup[3] = {32, 32, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 8u); EXPECT_EQ(workGroupSize[2], 1u); @@ -603,7 +603,7 @@ TEST(localWorkSizeTest, givenDeviceWith36ThreadsPerSubsliceWhenSimd16KernelIsBei size_t workGroup[3] = {1024, 1024, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 128u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -618,7 +618,7 @@ TEST(localWorkSizeTest, givenDeviceWith56ThreadsPerSubsliceWhenSimd16KernelIsBei size_t workGroup[3] = {1024, 1024, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 256u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); @@ -646,7 +646,7 @@ TEST(localWorkSizeTest, givenMaxWorkgroupSizeEqualToSimdSizeWhenLwsIsCalculatedT size_t workGroup[3] = {32, 32, 1}; size_t workGroupSize[3]; - OCLRT::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); + NEO::computeWorkgroupSizeND(wsInfo, workGroupSize, workGroup, workDim); EXPECT_EQ(workGroupSize[0], 32u); EXPECT_EQ(workGroupSize[1], 1u); EXPECT_EQ(workGroupSize[2], 1u); diff --git a/unit_tests/command_queue/multi_dispatch_info_tests.cpp b/unit_tests/command_queue/multi_dispatch_info_tests.cpp index 6499f2e8c1..094f96348d 100644 --- a/unit_tests/command_queue/multi_dispatch_info_tests.cpp +++ b/unit_tests/command_queue/multi_dispatch_info_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/mocks/mock_mdi.h" -using namespace OCLRT; +using namespace NEO; struct MultiDispatchInfoTest : public ::testing::Test { diff --git a/unit_tests/command_queue/multiple_map_buffer_tests.cpp b/unit_tests/command_queue/multiple_map_buffer_tests.cpp index 0747b9ef38..b86788d116 100644 --- a/unit_tests/command_queue/multiple_map_buffer_tests.cpp +++ b/unit_tests/command_queue/multiple_map_buffer_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct MultipleMapBufferTest : public DeviceFixture, public ::testing::Test { template diff --git a/unit_tests/command_queue/multiple_map_image_tests.cpp b/unit_tests/command_queue/multiple_map_image_tests.cpp index 62a8be257e..a0eea6030a 100644 --- a/unit_tests/command_queue/multiple_map_image_tests.cpp +++ b/unit_tests/command_queue/multiple_map_image_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct MultipleMapImageTest : public DeviceFixture, public ::testing::Test { template diff --git a/unit_tests/command_queue/oom_buffer_tests.cpp b/unit_tests/command_queue/oom_buffer_tests.cpp index 312c4b6d40..7f96c8273a 100644 --- a/unit_tests/command_queue/oom_buffer_tests.cpp +++ b/unit_tests/command_queue/oom_buffer_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/fixtures/simple_arg_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; struct OOMSetting { bool oomCS; diff --git a/unit_tests/command_queue/oom_image_tests.cpp b/unit_tests/command_queue/oom_image_tests.cpp index 473040c8a1..f02812f55a 100644 --- a/unit_tests/command_queue/oom_image_tests.cpp +++ b/unit_tests/command_queue/oom_image_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; struct OOMSetting { bool oomCS; diff --git a/unit_tests/command_queue/oom_tests.cpp b/unit_tests/command_queue/oom_tests.cpp index 34f9ba5a8a..5d61fc21a5 100644 --- a/unit_tests/command_queue/oom_tests.cpp +++ b/unit_tests/command_queue/oom_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; struct OOMSetting { bool oomCS; diff --git a/unit_tests/command_queue/ooq_task_tests.cpp b/unit_tests/command_queue/ooq_task_tests.cpp index ed15221aa0..8607700b0a 100644 --- a/unit_tests/command_queue/ooq_task_tests.cpp +++ b/unit_tests/command_queue/ooq_task_tests.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/mocks/mock_csr.h" -using namespace OCLRT; +using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { typedef OOQueueFixture CommandQueueFixture; diff --git a/unit_tests/command_queue/ooq_task_tests_mt.cpp b/unit_tests/command_queue/ooq_task_tests_mt.cpp index cd97ba3d45..2030fe0fb3 100644 --- a/unit_tests/command_queue/ooq_task_tests_mt.cpp +++ b/unit_tests/command_queue/ooq_task_tests_mt.cpp @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "unit_tests/command_queue/enqueue_fixture.h" #include "unit_tests/fixtures/hello_world_fixture.h" -using namespace OCLRT; +using namespace NEO; struct OOQFixtureFactory : public HelloWorldFixtureFactory { typedef OOQueueFixture CommandQueueFixture; diff --git a/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp b/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp index 1c13a38860..c728b3ba72 100644 --- a/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp +++ b/unit_tests/command_queue/read_write_buffer_cpu_copy.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/command_queue/enqueue_read_buffer_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef EnqueueReadBufferTypeTest ReadWriteBufferCpuCopyTest; diff --git a/unit_tests/command_queue/work_group_size_tests.cpp b/unit_tests/command_queue/work_group_size_tests.cpp index 0c0bd96f7c..6a4f31c027 100644 --- a/unit_tests/command_queue/work_group_size_tests.cpp +++ b/unit_tests/command_queue/work_group_size_tests.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" #include "patch_shared.h" -using namespace OCLRT; +using namespace NEO; struct WorkGroupSizeBase { template diff --git a/unit_tests/command_queue/zero_size_enqueue_tests.cpp b/unit_tests/command_queue/zero_size_enqueue_tests.cpp index 5f369df2af..ad8d479486 100644 --- a/unit_tests/command_queue/zero_size_enqueue_tests.cpp +++ b/unit_tests/command_queue/zero_size_enqueue_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; class ZeroSizeEnqueueHandlerTest : public DeviceFixture, public testing::Test { diff --git a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp index b7aa0abd26..e175487fb0 100644 --- a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -22,7 +22,7 @@ #include "unit_tests/mocks/mock_mdi.h" #include "unit_tests/mocks/mock_os_context.h" -using namespace OCLRT; +using namespace NEO; typedef Test AubCommandStreamReceiverTests; diff --git a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp index eb5dc4e5e1..6492dda3e3 100644 --- a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -28,7 +28,7 @@ #include "third_party/aub_stream/headers/options.h" -using namespace OCLRT; +using namespace NEO; typedef Test AubCommandStreamReceiverTests; diff --git a/unit_tests/command_stream/aub_file_stream_tests.cpp b/unit_tests/command_stream/aub_file_stream_tests.cpp index 65387c2306..4f930ff16c 100644 --- a/unit_tests/command_stream/aub_file_stream_tests.cpp +++ b/unit_tests/command_stream/aub_file_stream_tests.cpp @@ -24,7 +24,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using ::testing::_; using ::testing::Invoke; diff --git a/unit_tests/command_stream/aub_subcapture_tests.cpp b/unit_tests/command_stream/aub_subcapture_tests.cpp index 4d5e06f931..40e08f1e2f 100644 --- a/unit_tests/command_stream/aub_subcapture_tests.cpp +++ b/unit_tests/command_stream/aub_subcapture_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; struct AubSubCaptureTest : public DeviceFixture, public ::testing::Test { diff --git a/unit_tests/command_stream/cmd_parse_tests.cpp b/unit_tests/command_stream/cmd_parse_tests.cpp index 28f263fd54..7d4e2507f9 100644 --- a/unit_tests/command_stream/cmd_parse_tests.cpp +++ b/unit_tests/command_stream/cmd_parse_tests.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" -using namespace OCLRT; +using namespace NEO; struct CommandParse : public DeviceFixture, diff --git a/unit_tests/command_stream/command_stream_fixture.h b/unit_tests/command_stream/command_stream_fixture.h index 140489afcb..4af1a4cebc 100644 --- a/unit_tests/command_stream/command_stream_fixture.h +++ b/unit_tests/command_stream/command_stream_fixture.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { struct CommandStreamFixture { CommandStreamFixture(void) @@ -29,4 +29,4 @@ struct CommandStreamFixture { LinearStream *pCS; void *pCmdBuffer; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp index f01af8ecbf..7ff45b4349 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/mocks/mock_event.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -using namespace OCLRT; +using namespace NEO; typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskTests; @@ -281,7 +281,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenHigherTaskLevelWhenTimestampP HWTEST_F(CommandStreamReceiverFlushTaskTests, whenSamplerCacheFlushNotRequiredThenDontSendPipecontrol) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); - OCLRT::WorkaroundTable *waTable = nullptr; + NEO::WorkaroundTable *waTable = nullptr; waTable = const_cast(pDevice->getWaTable()); commandStreamReceiver.isPreambleSent = true; @@ -309,7 +309,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, whenSamplerCacheFlushBeforeThenSen commandStreamReceiver.setSamplerCacheFlushRequired(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushBefore); configureCSRtoNonDirtyState(); commandStreamReceiver.taskLevel = taskLevel; - OCLRT::WorkaroundTable *waTable = nullptr; + NEO::WorkaroundTable *waTable = nullptr; waTable = const_cast(pDevice->getWaTable()); bool tmp = waTable->waSamplerCacheFlushBetweenRedescribedSurfaceReads; @@ -335,7 +335,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, whenSamplerCacheFlushBeforeAndWaSa commandStreamReceiver.setSamplerCacheFlushRequired(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushBefore); configureCSRtoNonDirtyState(); commandStreamReceiver.taskLevel = taskLevel; - OCLRT::WorkaroundTable *waTable = nullptr; + NEO::WorkaroundTable *waTable = nullptr; waTable = const_cast(pDevice->getWaTable()); bool tmp = waTable->waSamplerCacheFlushBetweenRedescribedSurfaceReads; @@ -359,7 +359,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, whenSamplerCacheFlushAfterThenSend commandStreamReceiver.setSamplerCacheFlushRequired(CommandStreamReceiver::SamplerCacheFlushState::samplerCacheFlushAfter); configureCSRtoNonDirtyState(); commandStreamReceiver.taskLevel = taskLevel; - OCLRT::WorkaroundTable *waTable = nullptr; + NEO::WorkaroundTable *waTable = nullptr; waTable = const_cast(pDevice->getWaTable()); bool tmp = waTable->waSamplerCacheFlushBetweenRedescribedSurfaceReads; diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp index b5a09b4bef..ac9c4dbc43 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -23,7 +23,7 @@ #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskTests; @@ -400,7 +400,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, CreateCommandStreamReceiverHw) { int32_t GetCsr = DebugManager.flags.SetCommandStreamReceiver.get(); EXPECT_EQ(0, GetCsr); - auto csr = OCLRT::createCommandStream(*pDevice->executionEnvironment); + auto csr = NEO::createCommandStream(*pDevice->executionEnvironment); EXPECT_NE(nullptr, csr); delete csr; DebugManager.flags.SetCommandStreamReceiver.set(0); @@ -912,7 +912,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrWhenSamplerCacheFlushSentT auto samplerCacheFlushBeforeSize = commandStreamReceiver.getRequiredCmdStreamSize(flags, *pDevice); EXPECT_EQ(samplerCacheNotFlushedSize, samplerCacheFlushBeforeSize); - OCLRT::WorkaroundTable *waTable = const_cast(pDevice->getWaTable()); + NEO::WorkaroundTable *waTable = const_cast(pDevice->getWaTable()); bool tmp = waTable->waSamplerCacheFlushBetweenRedescribedSurfaceReads; waTable->waSamplerCacheFlushBetweenRedescribedSurfaceReads = true; diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp index effb18e9ec..1be4e991b7 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -21,7 +21,7 @@ #include "unit_tests/mocks/mock_program.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -using namespace OCLRT; +using namespace NEO; typedef UltCommandStreamReceiverTest CommandStreamReceiverFlushTaskTests; diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index 40e7878e7a..292a9f7a11 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -40,7 +40,7 @@ #include "gtest/gtest.h" #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; using ::testing::_; using ::testing::Invoke; diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index 659a240c9a..146d3275d0 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -43,7 +43,7 @@ #include -using namespace OCLRT; +using namespace NEO; HWCMDTEST_F(IGFX_GEN8_CORE, UltCommandStreamReceiverTest, givenPreambleSentAndThreadArbitrationPolicyNotChangedWhenEstimatingPreambleCmdSizeThenReturnItsValue) { auto &commandStreamReceiver = pDevice->getUltCommandStreamReceiver(); diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.inl b/unit_tests/command_stream/command_stream_receiver_hw_tests.inl index c8a864d717..6193b6d865 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.inl +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.inl @@ -5,7 +5,7 @@ * */ -using namespace OCLRT; +using namespace NEO; template struct CommandStreamReceiverHwTest : public DeviceFixture, diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp index a146e1649e..66986cb651 100644 --- a/unit_tests/command_stream/command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_tests.cpp @@ -32,7 +32,7 @@ #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; struct CommandStreamReceiverTest : public DeviceFixture, public ::testing::Test { diff --git a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index b5982d1ff7..3fd9967f2c 100644 --- a/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -21,7 +21,7 @@ #include "unit_tests/mocks/mock_aub_manager.h" #include "unit_tests/mocks/mock_os_context.h" -using namespace OCLRT; +using namespace NEO; struct MyMockCsr : UltCommandStreamReceiver { MyMockCsr(ExecutionEnvironment &executionEnvironment) diff --git a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp index bac0c05e4e..d56c707b11 100644 --- a/unit_tests/command_stream/create_command_stream_receiver_tests.cpp +++ b/unit_tests/command_stream/create_command_stream_receiver_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" -using namespace OCLRT; +using namespace NEO; struct CreateCommandStreamReceiverTest : public ::testing::TestWithParam {}; diff --git a/unit_tests/command_stream/experimental_command_buffer_tests.cpp b/unit_tests/command_stream/experimental_command_buffer_tests.cpp index b01055c910..e2a75bfaa2 100644 --- a/unit_tests/command_stream/experimental_command_buffer_tests.cpp +++ b/unit_tests/command_stream/experimental_command_buffer_tests.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct ExperimentalCommandBufferTest : public UltCommandStreamReceiverTest { void SetUp() override { diff --git a/unit_tests/command_stream/get_devices_tests.cpp b/unit_tests/command_stream/get_devices_tests.cpp index ebb9a6ee12..738f5e18ef 100644 --- a/unit_tests/command_stream/get_devices_tests.cpp +++ b/unit_tests/command_stream/get_devices_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/libult/create_command_stream.h" -namespace OCLRT { +namespace NEO { bool operator==(const HardwareInfo &hwInfoIn, const HardwareInfo &hwInfoOut) { bool result = (0 == memcmp(hwInfoIn.pPlatform, hwInfoOut.pPlatform, sizeof(PLATFORM))); result &= (0 == memcmp(hwInfoIn.pSkuTable, hwInfoOut.pSkuTable, sizeof(FeatureTable))); @@ -149,4 +149,4 @@ HWTEST_F(GetDevicesTest, givenGetDevicesAndUnknownProductFamilyWhenCsrIsSetToVal } } } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_stream/linear_stream_fixture.h b/unit_tests/command_stream/linear_stream_fixture.h index 2e22f0be3d..52d7cb05d9 100644 --- a/unit_tests/command_stream/linear_stream_fixture.h +++ b/unit_tests/command_stream/linear_stream_fixture.h @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { struct LinearStreamFixture { LinearStreamFixture(void) @@ -30,4 +30,4 @@ struct LinearStreamFixture { }; typedef Test LinearStreamTest; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_stream/linear_stream_tests.cpp b/unit_tests/command_stream/linear_stream_tests.cpp index 61dfe48dbc..47c09d29f9 100644 --- a/unit_tests/command_stream/linear_stream_tests.cpp +++ b/unit_tests/command_stream/linear_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "unit_tests/command_stream/linear_stream_fixture.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -using namespace OCLRT; +using namespace NEO; TEST(LinearStreamCtorTest, establishInitialValues) { LinearStream linearStream; diff --git a/unit_tests/command_stream/submissions_aggregator_tests.cpp b/unit_tests/command_stream/submissions_aggregator_tests.cpp index fe1286af2d..db94d53396 100644 --- a/unit_tests/command_stream/submissions_aggregator_tests.cpp +++ b/unit_tests/command_stream/submissions_aggregator_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_graphics_allocation.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; struct MockSubmissionAggregator : public SubmissionAggregator { CommandBufferList &peekCommandBuffersList() { diff --git a/unit_tests/command_stream/tbx_command_stream_fixture.cpp b/unit_tests/command_stream/tbx_command_stream_fixture.cpp index e9528d3d30..d00c8cf732 100644 --- a/unit_tests/command_stream/tbx_command_stream_fixture.cpp +++ b/unit_tests/command_stream/tbx_command_stream_fixture.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { void TbxCommandStreamFixture::SetUp(MockDevice *pDevice) { // Create our TBX command stream receiver based on HW type @@ -29,4 +29,4 @@ void TbxCommandStreamFixture::TearDown() { delete mmTbx; CommandStreamFixture::TearDown(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_stream/tbx_command_stream_fixture.h b/unit_tests/command_stream/tbx_command_stream_fixture.h index 92ca61e7cc..e4ef62036e 100644 --- a/unit_tests/command_stream/tbx_command_stream_fixture.h +++ b/unit_tests/command_stream/tbx_command_stream_fixture.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class CommandStreamReceiver; class MockDevice; @@ -25,4 +25,4 @@ class TbxCommandStreamFixture : public CommandStreamFixture { MemoryManager *mmTbx; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/command_stream/tbx_command_stream_tests.cpp b/unit_tests/command_stream/tbx_command_stream_tests.cpp index 49a7fc4359..7f0d6a9acd 100644 --- a/unit_tests/command_stream/tbx_command_stream_tests.cpp +++ b/unit_tests/command_stream/tbx_command_stream_tests.cpp @@ -33,11 +33,11 @@ #include -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { extern TbxCommandStreamReceiverCreateFunc tbxCommandStreamReceiverFactory[IGFX_MAX_CORE]; -} // namespace OCLRT +} // namespace NEO namespace Os { extern const char *tbxLibName; diff --git a/unit_tests/command_stream/tbx_stream_tests.cpp b/unit_tests/command_stream/tbx_stream_tests.cpp index d7f115b247..0787d61754 100644 --- a/unit_tests/command_stream/tbx_stream_tests.cpp +++ b/unit_tests/command_stream/tbx_stream_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(TbxStreamTests, givenTbxStreamWhenWriteMemoryIsCalledThenTypeIsZero) { std::unique_ptr mockTbxStream(new MockTbxStream()); diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index cce7148f6b..bbb64ebf54 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -21,7 +21,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; class BinaryCacheFixture diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index 19c3319a3b..f4d79789dd 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -27,7 +27,7 @@ #include -using namespace OCLRT; +using namespace NEO; #if defined(_WIN32) const char *gBadDompilerDllName = "bad_compiler.dll"; @@ -109,19 +109,19 @@ class MyCompilerInterface : public CompilerInterface { compilerInterface->mockDebugData[n] = (char)n; } - auto vars = OCLRT::getIgcDebugVars(); + auto vars = NEO::getIgcDebugVars(); vars.debugDataToReturn = compilerInterface->mockDebugData; vars.debugDataToReturnSize = sizeof(compilerInterface->mockDebugData); - OCLRT::setIgcDebugVars(vars); + NEO::setIgcDebugVars(vars); return compilerInterface; } ~MyCompilerInterface() override { - auto vars = OCLRT::getIgcDebugVars(); + auto vars = NEO::getIgcDebugVars(); vars.debugDataToReturn = nullptr; vars.debugDataToReturnSize = 0; - OCLRT::setIgcDebugVars(vars); + NEO::setIgcDebugVars(vars); } bool initializePub() { @@ -217,7 +217,7 @@ TEST_F(CompilerInterfaceTest, CompileClToIsa) { TEST_F(CompilerInterfaceTest, WhenBuildIsInvokedThenFclReceivesListOfExtensionsInInternalOptions) { std::string receivedInternalOptions; - auto debugVars = OCLRT::getFclDebugVars(); + auto debugVars = NEO::getFclDebugVars(); debugVars.receivedInternalOptionsOutput = &receivedInternalOptions; gEnvironment->fclPushDebugVars(debugVars); retVal = pCompilerInterface->build(*pProgram, inputArgs, false); @@ -583,7 +583,7 @@ TEST(TranslateTest, whenArgsAreValidAndTranslatorReturnsValidOutputThenValidOutp auto mockOpt = CIF::RAII::UPtr_t(new MockCIFBuffer()); auto mockIntOpt = CIF::RAII::UPtr_t(new MockCIFBuffer()); - auto ret = OCLRT::translate(&mockTranslationCtx, mockSrc.get(), mockOpt.get(), mockIntOpt.get()); + auto ret = NEO::translate(&mockTranslationCtx, mockSrc.get(), mockOpt.get(), mockIntOpt.get()); EXPECT_NE(nullptr, ret); EXPECT_EQ(mockSrc.get(), mockTranslationCtx.receivedSrc); @@ -596,7 +596,7 @@ TEST(TranslateTest, whenTranslatorReturnsNullptrThenNullptrIsReturned) { mockTranslationCtx.returnNullptr = true; auto mockCifBuffer = CIF::RAII::UPtr_t(new MockCIFBuffer()); - auto ret = OCLRT::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get()); + auto ret = NEO::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get()); EXPECT_EQ(nullptr, ret); } @@ -605,7 +605,7 @@ TEST(TranslateTest, givenNullPtrAsGtPinInputWhenTranslatorReturnsNullptrThenNull mockTranslationCtx.returnNullptr = true; auto mockCifBuffer = std::make_unique(); - auto ret = OCLRT::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get(), nullptr); + auto ret = NEO::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get(), nullptr); EXPECT_EQ(nullptr, ret); } @@ -616,7 +616,7 @@ TEST(TranslateTest, whenTranslatorReturnsInvalidOutputThenNullptrIsReturned) { mockTranslationCtx.returnNullptrDebugData = (i & 1) != 0; mockTranslationCtx.returnNullptrLog = (i & (1 << 1)) != 0; mockTranslationCtx.returnNullptrOutput = (i & (1 << 2)) != 0; - auto ret = OCLRT::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get()); + auto ret = NEO::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get()); EXPECT_EQ(nullptr, ret); } } @@ -628,7 +628,7 @@ TEST(TranslateTest, givenNullPtrAsGtPinInputWhenTranslatorReturnsInvalidOutputTh mockTranslationCtx.returnNullptrDebugData = (i & 1) != 0; mockTranslationCtx.returnNullptrLog = (i & (1 << 1)) != 0; mockTranslationCtx.returnNullptrOutput = (i & (1 << 2)) != 0; - auto ret = OCLRT::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get(), nullptr); + auto ret = NEO::translate(&mockTranslationCtx, mockCifBuffer.get(), mockCifBuffer.get(), mockCifBuffer.get(), nullptr); EXPECT_EQ(nullptr, ret); } } @@ -641,7 +641,7 @@ TEST(TranslateTest, whenAnyArgIsNullThenNullptrIsReturnedAndTranslatorIsNotInvok auto opts = (i & (1 << 1)) ? mockCifBuffer.get() : nullptr; auto intOpts = (i & (1 << 2)) ? mockCifBuffer.get() : nullptr; - auto ret = OCLRT::translate(&mockTranslationCtx, src, opts, intOpts); + auto ret = NEO::translate(&mockTranslationCtx, src, opts, intOpts); EXPECT_EQ(nullptr, ret); } @@ -653,7 +653,7 @@ TEST(TranslateTest, whenAnyArgIsNullThenNullptrIsReturnedAndTranslatorIsNotInvok TEST(LoadCompilerTest, whenEverythingIsOkThenReturnsTrueAndValidOutputs) { MockCompilerEnableGuard mock; - std::unique_ptr retLib; + std::unique_ptr retLib; CIF::RAII::UPtr_t retMain; bool retVal = loadCompiler("", retLib, retMain); EXPECT_TRUE(retVal); @@ -663,7 +663,7 @@ TEST(LoadCompilerTest, whenEverythingIsOkThenReturnsTrueAndValidOutputs) { TEST(LoadCompilerTest, whenCouldNotLoadLibraryThenReturnFalseAndNullOutputs) { MockCompilerEnableGuard mock; - std::unique_ptr retLib; + std::unique_ptr retLib; CIF::RAII::UPtr_t retMain; bool retVal = loadCompiler("falseName.notRealLib", retLib, retMain); EXPECT_FALSE(retVal); @@ -672,22 +672,22 @@ TEST(LoadCompilerTest, whenCouldNotLoadLibraryThenReturnFalseAndNullOutputs) { } TEST(LoadCompilerTest, whenCreateMainFailsThenReturnFalseAndNullOutputs) { - OCLRT::failCreateCifMain = true; + NEO::failCreateCifMain = true; MockCompilerEnableGuard mock; - std::unique_ptr retLib; + std::unique_ptr retLib; CIF::RAII::UPtr_t retMain; bool retVal = loadCompiler("", retLib, retMain); EXPECT_FALSE(retVal); EXPECT_EQ(nullptr, retLib.get()); EXPECT_EQ(nullptr, retMain.get()); - OCLRT::failCreateCifMain = false; + NEO::failCreateCifMain = false; } TEST(LoadCompilerTest, whenEntrypointInterfaceIsNotCompatibleThenReturnFalseAndNullOutputs) { MockCompilerEnableGuard mock; - std::unique_ptr retLib; + std::unique_ptr retLib; CIF::RAII::UPtr_t retMain; bool retVal = loadCompiler("", retLib, retMain); EXPECT_FALSE(retVal); @@ -708,7 +708,7 @@ struct MockCompilerDeviceCtx : DeviceCtxBase { template struct LockListener { - LockListener(OCLRT::Device *device) + LockListener(NEO::Device *device) : device(device) { } @@ -720,7 +720,7 @@ struct LockListener { data->createdDeviceCtx = deviceCtx.get(); } - OCLRT::Device *device = nullptr; + NEO::Device *device = nullptr; MockDeviceCtx *createdDeviceCtx = nullptr; }; @@ -764,7 +764,7 @@ TEST_F(CompilerInterfaceTest, GivenSimultaneousRequestForNewFclTranslationContex } TEST_F(CompilerInterfaceTest, GivenRequestForNewTranslationCtxWhenFclMainIsNotAvailableThenReturnNullptr) { - OCLRT::failCreateCifMain = true; + NEO::failCreateCifMain = true; auto device = this->pContext->getDevice(0); MockCompilerInterface tempCompilerInterface; @@ -773,16 +773,16 @@ TEST_F(CompilerInterfaceTest, GivenRequestForNewTranslationCtxWhenFclMainIsNotAv auto retIgc = tempCompilerInterface.createIgcTranslationCtx(*device, IGC::CodeType::oclC, IGC::CodeType::spirV); EXPECT_EQ(nullptr, retIgc); - OCLRT::failCreateCifMain = false; + NEO::failCreateCifMain = false; } TEST_F(CompilerInterfaceTest, GivenRequestForNewTranslationCtxWhenCouldNotCreateDeviceCtxThenReturnNullptr) { auto device = this->pContext->getDevice(0); - auto befFclMock = OCLRT::MockCIFMain::getGlobalCreatorFunc(); - auto befIgcMock = OCLRT::MockCIFMain::getGlobalCreatorFunc(); - OCLRT::MockCIFMain::setGlobalCreatorFunc(nullptr); - OCLRT::MockCIFMain::setGlobalCreatorFunc(nullptr); + auto befFclMock = NEO::MockCIFMain::getGlobalCreatorFunc(); + auto befIgcMock = NEO::MockCIFMain::getGlobalCreatorFunc(); + NEO::MockCIFMain::setGlobalCreatorFunc(nullptr); + NEO::MockCIFMain::setGlobalCreatorFunc(nullptr); auto retFcl = pCompilerInterface->createFclTranslationCtx(*device, IGC::CodeType::oclC, IGC::CodeType::spirV); EXPECT_EQ(nullptr, retFcl); @@ -790,8 +790,8 @@ TEST_F(CompilerInterfaceTest, GivenRequestForNewTranslationCtxWhenCouldNotCreate auto retIgc = pCompilerInterface->createIgcTranslationCtx(*device, IGC::CodeType::oclC, IGC::CodeType::spirV); EXPECT_EQ(nullptr, retIgc); - OCLRT::MockCIFMain::setGlobalCreatorFunc(befFclMock); - OCLRT::MockCIFMain::setGlobalCreatorFunc(befIgcMock); + NEO::MockCIFMain::setGlobalCreatorFunc(befFclMock); + NEO::MockCIFMain::setGlobalCreatorFunc(befIgcMock); } TEST_F(CompilerInterfaceTest, GivenRequestForNewIgcTranslationCtxWhenDeviceCtxIsAlreadyAvailableThenUseItToReturnValidTranslationCtx) { diff --git a/unit_tests/context/context_get_info_tests.cpp b/unit_tests/context/context_get_info_tests.cpp index 8038f070a7..258c14714f 100644 --- a/unit_tests/context/context_get_info_tests.cpp +++ b/unit_tests/context/context_get_info_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct ContextGetInfoTest : public PlatformFixture, public ContextFixture, diff --git a/unit_tests/context/context_multi_device_tests.cpp b/unit_tests/context/context_multi_device_tests.cpp index 34d1ee390b..7f80efb270 100644 --- a/unit_tests/context/context_multi_device_tests.cpp +++ b/unit_tests/context/context_multi_device_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; TEST(ContextMultiDevice, singleDevice) { cl_device_id devices[] = { diff --git a/unit_tests/context/context_negative_tests.cpp b/unit_tests/context/context_negative_tests.cpp index a73845a337..06471f072e 100644 --- a/unit_tests/context/context_negative_tests.cpp +++ b/unit_tests/context/context_negative_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; //////////////////////////////////////////////////////////////////////////////// typedef Test ContextFailureInjection; @@ -48,7 +48,7 @@ TEST_F(ContextFailureInjection, failedAllocationInjection) { TEST(InvalidPropertyContextTest, GivenInvalidPropertiesWhenContextIsCreatedThenErrorIsReturned) { auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(nullptr)); cl_device_id deviceID = device.get(); - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; cl_context_properties invalidProperties[5] = {CL_CONTEXT_PLATFORM, (cl_context_properties)pid[0], CL_CGL_SHAREGROUP_KHR, 0x10000, 0}; diff --git a/unit_tests/context/context_tests.cpp b/unit_tests/context/context_tests.cpp index c1680069b0..5fd7269d40 100644 --- a/unit_tests/context/context_tests.cpp +++ b/unit_tests/context/context_tests.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class WhiteBoxContext : public Context { public: @@ -249,7 +249,7 @@ TEST_F(ContextTest, givenSpecialCmdQueueWithContextWhenBeingCreatedNextDeletedTh TEST_F(ContextTest, GivenInteropSyncParamWhenCreateContextThenSetContextParam) { cl_device_id deviceID = devices[0]; - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; diff --git a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp index b2fae35da6..e8b898b8d2 100644 --- a/unit_tests/context/driver_diagnostics_enqueue_tests.cpp +++ b/unit_tests/context/driver_diagnostics_enqueue_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/helpers/debug_manager_state_restore.h" -using namespace OCLRT; +using namespace NEO; TEST_F(PerformanceHintEnqueueBufferTest, GivenBlockingReadWhenEnqueueReadBufferIsCallingWithCPUCopyThenContextProvidesProperHint) { diff --git a/unit_tests/context/driver_diagnostics_tests.cpp b/unit_tests/context/driver_diagnostics_tests.cpp index 2eefb7d77b..699c31b53b 100644 --- a/unit_tests/context/driver_diagnostics_tests.cpp +++ b/unit_tests/context/driver_diagnostics_tests.cpp @@ -9,7 +9,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" -using namespace OCLRT; +using namespace NEO; bool containsHint(const char *providedHint, char *userData) { for (auto i = 0; i < maxHintCounter; i++) { diff --git a/unit_tests/context/driver_diagnostics_tests.h b/unit_tests/context/driver_diagnostics_tests.h index 9b7046fd72..85fd1fcc43 100644 --- a/unit_tests/context/driver_diagnostics_tests.h +++ b/unit_tests/context/driver_diagnostics_tests.h @@ -22,7 +22,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; const int maxHintCounter = 4; @@ -77,7 +77,7 @@ struct PerformanceHintTest : public DriverDiagnosticsTest, DriverDiagnosticsTest::SetUp(); cl_device_id deviceID = devices[0]; cl_context_properties validProperties[3] = {CL_CONTEXT_SHOW_DIAGNOSTICS_INTEL, CL_CONTEXT_DIAGNOSTICS_LEVEL_ALL_INTEL, 0}; - context = Context::create(validProperties, DeviceVector(&deviceID, 1), callbackFunction, (void *)userData, retVal); + context = Context::create(validProperties, DeviceVector(&deviceID, 1), callbackFunction, (void *)userData, retVal); EXPECT_EQ(CL_SUCCESS, retVal); } diff --git a/unit_tests/context/get_supported_image_formats_tests.cpp b/unit_tests/context/get_supported_image_formats_tests.cpp index 90e128b9c3..a043b93434 100644 --- a/unit_tests/context/get_supported_image_formats_tests.cpp +++ b/unit_tests/context/get_supported_image_formats_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct GetSupportedImageFormatsTest : public PlatformFixture, public ContextFixture, diff --git a/unit_tests/context/gl/context_gl_tests.cpp b/unit_tests/context/gl/context_gl_tests.cpp index fc30c79392..3d7404c0a0 100644 --- a/unit_tests/context/gl/context_gl_tests.cpp +++ b/unit_tests/context/gl/context_gl_tests.cpp @@ -21,7 +21,7 @@ #include "gtest/gtest.h" #include -using namespace OCLRT; +using namespace NEO; // use mockGlSharing class for cl-gl sharing tests typedef bool (*MockGlIoctlFcn)(); @@ -58,7 +58,7 @@ TEST_F(ContextTest, GlSharingAreIstPresentByDefault) { ASSERT_EQ(context->getSha TEST_F(ContextTest, GivenPropertiesWhenContextIsCreatedThenSuccess) { cl_device_id deviceID = devices[0]; - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; @@ -94,7 +94,7 @@ TEST_F(ContextTest, GivenPropertiesWhenContextIsCreatedThenSuccess) { TEST_F(ContextTest, GivenTwoGlPropertiesWhenContextIsCreatedThenSuccess) { cl_device_id deviceID = devices[0]; - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; @@ -125,7 +125,7 @@ TEST_F(ContextTest, GivenTwoGlPropertiesWhenContextIsCreatedThenSuccess) { TEST_F(ContextTest, GivenGlContextParamWhenCreateContextThenInitSharingFunctions) { cl_device_id deviceID = devices[0]; - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; diff --git a/unit_tests/d3d_sharing/d3d9_tests.cpp b/unit_tests/d3d_sharing/d3d9_tests.cpp index 2c603f65eb..2e11f41731 100644 --- a/unit_tests/d3d_sharing/d3d9_tests.cpp +++ b/unit_tests/d3d_sharing/d3d9_tests.cpp @@ -20,7 +20,7 @@ #include "unit_tests/mocks/mock_d3d_objects.h" #include "unit_tests/mocks/mock_gmm.h" -namespace OCLRT { +namespace NEO { template <> uint32_t MockD3DSharingFunctions::getDxgiDescCalled = 0; template <> @@ -1056,4 +1056,4 @@ TEST_P(D3D9ImageFormatTests, validFormat) { EXPECT_EQ(imgFormat.image_channel_order, expectedClChannelOrder); EXPECT_TRUE(oclPlane == expectedOclPlane); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/d3d_sharing/d3d_tests.cpp b/unit_tests/d3d_sharing/d3d_tests.cpp index 00240df47b..a9a305a09a 100644 --- a/unit_tests/d3d_sharing/d3d_tests.cpp +++ b/unit_tests/d3d_sharing/d3d_tests.cpp @@ -28,7 +28,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { template <> uint32_t MockD3DSharingFunctions::getDxgiDescCalled = 0; template <> @@ -1708,4 +1708,4 @@ TEST_F(clIntelSharingFormatQueryDX11, givenValidParametersWhenRequestedDX11Textu ASSERT_EQ(memcmp(&retrievedFormats[0], &formatsRetrievedForTheSecondTime[0], numImageFormats * sizeof(DXGI_FORMAT)), 0); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/device/device_caps_tests.cpp b/unit_tests/device/device_caps_tests.cpp index d71c0ed061..94fa240618 100644 --- a/unit_tests/device/device_caps_tests.cpp +++ b/unit_tests/device/device_caps_tests.cpp @@ -28,11 +28,11 @@ #include -namespace OCLRT { +namespace NEO { extern const char *familyName[]; } -using namespace OCLRT; +using namespace NEO; typedef Test DeviceGetCapsF; diff --git a/unit_tests/device/device_tests.cpp b/unit_tests/device/device_tests.cpp index c88e52920c..f518834b14 100644 --- a/unit_tests/device/device_tests.cpp +++ b/unit_tests/device/device_tests.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test DeviceTest; diff --git a/unit_tests/device/device_timers_tests.cpp b/unit_tests/device/device_timers_tests.cpp index 2ff0d34fd7..06ecf7201e 100644 --- a/unit_tests/device/device_timers_tests.cpp +++ b/unit_tests/device/device_timers_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/device/device_win_timers_tests.cpp b/unit_tests/device/device_win_timers_tests.cpp index de721e2b39..3a60722e0d 100644 --- a/unit_tests/device/device_win_timers_tests.cpp +++ b/unit_tests/device/device_win_timers_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/device/get_device_info_size_tests.cpp b/unit_tests/device/get_device_info_size_tests.cpp index fda095af24..cb9690aec3 100644 --- a/unit_tests/device/get_device_info_size_tests.cpp +++ b/unit_tests/device/get_device_info_size_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct GetDeviceInfoSize : public ::testing::TestWithParam> { void SetUp() override { diff --git a/unit_tests/device/get_device_info_tests.cpp b/unit_tests/device/get_device_info_tests.cpp index ee284c7a6f..07866fbef9 100644 --- a/unit_tests/device/get_device_info_tests.cpp +++ b/unit_tests/device/get_device_info_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(GetDeviceInfo, InvalidFlags_returnsError) { auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(nullptr)); diff --git a/unit_tests/device/gl/device_caps_gl_tests.cpp b/unit_tests/device/gl/device_caps_gl_tests.cpp index 0caca3ba61..109133eb7b 100644 --- a/unit_tests/device/gl/device_caps_gl_tests.cpp +++ b/unit_tests/device/gl/device_caps_gl_tests.cpp @@ -20,7 +20,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(Device_GetCaps, givenForceClGlSharingWhenCapsAreCreatedThenDeviceReporstClGlSharingExtension) { DebugManagerStateRestore dbgRestorer; diff --git a/unit_tests/device_queue/device_queue_hw_tests.cpp b/unit_tests/device_queue/device_queue_hw_tests.cpp index 5b417dc469..c845de09a8 100644 --- a/unit_tests/device_queue/device_queue_hw_tests.cpp +++ b/unit_tests/device_queue/device_queue_hw_tests.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; HWTEST_F(DeviceQueueHwTest, resetOnlyExpected) { diff --git a/unit_tests/device_queue/device_queue_tests.cpp b/unit_tests/device_queue/device_queue_tests.cpp index fea44f99bd..8235fd3d23 100644 --- a/unit_tests/device_queue/device_queue_tests.cpp +++ b/unit_tests/device_queue/device_queue_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; TEST(DeviceQueueSimpleTest, setupExecutionModelDispatchDoesNothing) { diff --git a/unit_tests/device_queue/get_device_queue_info_tests.cpp b/unit_tests/device_queue/get_device_queue_info_tests.cpp index 4038e67d77..84dfc06e58 100644 --- a/unit_tests/device_queue/get_device_queue_info_tests.cpp +++ b/unit_tests/device_queue/get_device_queue_info_tests.cpp @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/context/context.h" #include "unit_tests/fixtures/device_host_queue_fixture.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; class GetDeviceQueueInfoTest : public DeviceHostQueueFixture { diff --git a/unit_tests/elflib/elf_binary_simulator.h b/unit_tests/elflib/elf_binary_simulator.h index dc5e7d7b8b..d9642cfd27 100644 --- a/unit_tests/elflib/elf_binary_simulator.h +++ b/unit_tests/elflib/elf_binary_simulator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "elf/types.h" #include "elf/writer.h" -namespace OCLRT { +namespace NEO { void MockElfBinary(CLElfLib::ElfBinaryStorage &elfBinary) { CLElfLib::CElfWriter elfWriter(CLElfLib::E_EH_TYPE::EH_TYPE_OPENCL_LIBRARY, CLElfLib::E_EH_MACHINE::EH_MACHINE_NONE, 0); @@ -19,4 +19,4 @@ void MockElfBinary(CLElfLib::ElfBinaryStorage &elfBinary) { elfWriter.resolveBinary(elfBinary); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/event/async_events_handler_tests.cpp b/unit_tests/event/async_events_handler_tests.cpp index a588fd7528..86d7fa6789 100644 --- a/unit_tests/event/async_events_handler_tests.cpp +++ b/unit_tests/event/async_events_handler_tests.cpp @@ -16,7 +16,7 @@ #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; class AsyncEventsHandlerTests : public ::testing::Test { diff --git a/unit_tests/event/event_builder_tests.cpp b/unit_tests/event/event_builder_tests.cpp index d074f5bc35..5bfbad7b2c 100644 --- a/unit_tests/event/event_builder_tests.cpp +++ b/unit_tests/event/event_builder_tests.cpp @@ -19,7 +19,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct SmallEventBuilderEventMock : MockEvent { SmallEventBuilderEventMock(int param1, float param2) @@ -366,4 +366,4 @@ TEST(EventBuilder, parentListDoesNotHaveDuplicates) { delete eventBuilder; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/event/event_callbacks_tests.cpp b/unit_tests/event/event_callbacks_tests.cpp index cb3becde61..a1daba2b0e 100644 --- a/unit_tests/event/event_callbacks_tests.cpp +++ b/unit_tests/event/event_callbacks_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct CallbackData { static void CL_CALLBACK callback(cl_event event, cl_int status, void *userData) { diff --git a/unit_tests/event/event_fixture.h b/unit_tests/event/event_fixture.h index 84afd4ee93..444980b4d7 100644 --- a/unit_tests/event/event_fixture.h +++ b/unit_tests/event/event_fixture.h @@ -22,7 +22,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct EventTest : public DeviceFixture, diff --git a/unit_tests/event/user_events_tests.cpp b/unit_tests/event/user_events_tests.cpp index 7b617310c4..6e2628f9f6 100644 --- a/unit_tests/event/user_events_tests.cpp +++ b/unit_tests/event/user_events_tests.cpp @@ -180,10 +180,10 @@ TEST_F(MockEventTests, blockedUserEventPassedToEnqueueNdRangeWithoutReturnEventI auto taskCountAfter = csr.peekTaskCount(); //queue should be in blocked state at this moment, task level should be inherited from user event - EXPECT_EQ(OCLRT::Event::eventNotReady, pCmdQ->taskLevel); + EXPECT_EQ(NEO::Event::eventNotReady, pCmdQ->taskLevel); //queue should be in blocked state at this moment, task count should be inherited from user event - EXPECT_EQ(OCLRT::Event::eventNotReady, pCmdQ->taskCount); + EXPECT_EQ(NEO::Event::eventNotReady, pCmdQ->taskCount); //queue should be in blocked state EXPECT_EQ(pCmdQ->isQueueBlocked(), true); @@ -213,10 +213,10 @@ TEST_F(MockEventTests, blockedUserEventPassedToEnqueueNdRangeWithReturnEventIsNo auto taskCountAfter = csr.peekTaskCount(); //queue should be in blocked state at this moment, task level should be inherited from user event - EXPECT_EQ(OCLRT::Event::eventNotReady, pCmdQ->taskLevel); + EXPECT_EQ(NEO::Event::eventNotReady, pCmdQ->taskLevel); //queue should be in blocked state at this moment, task count should be inherited from user event - EXPECT_EQ(OCLRT::Event::eventNotReady, pCmdQ->taskCount); + EXPECT_EQ(NEO::Event::eventNotReady, pCmdQ->taskCount); //queue should be in blocked state EXPECT_EQ(pCmdQ->isQueueBlocked(), true); @@ -232,7 +232,7 @@ TEST_F(MockEventTests, blockedUserEventPassedToEnqueueNdRangeWithReturnEventIsNo //and if normal event inherited status from user event Event *returnEvent = castToObject(retEvent); - EXPECT_EQ(returnEvent->taskLevel, OCLRT::Event::eventNotReady); + EXPECT_EQ(returnEvent->taskLevel, NEO::Event::eventNotReady); EXPECT_EQ(CL_SUCCESS, retVal); diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/unit_tests/execution_environment/execution_environment_tests.cpp index 57b08bc891..b5dff548d0 100644 --- a/unit_tests/execution_environment/execution_environment_tests.cpp +++ b/unit_tests/execution_environment/execution_environment_tests.cpp @@ -27,7 +27,7 @@ #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/utilities/destructor_counted.h" -using namespace OCLRT; +using namespace NEO; TEST(ExecutionEnvironment, givenDefaultConstructorWhenItIsCalledThenExecutionEnvironmentHasInitialRefCountZero) { ExecutionEnvironment environment; @@ -104,7 +104,7 @@ TEST(ExecutionEnvironment, givenPlatformWhenItIsCreatedThenItCreatesMemoryManage TEST(ExecutionEnvironment, givenDeviceWhenItIsDestroyedThenMemoryManagerIsStillAvailable) { ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment(); executionEnvironment->initializeMemoryManager(); - std::unique_ptr device(Device::create(nullptr, executionEnvironment, 0u)); + std::unique_ptr device(Device::create(nullptr, executionEnvironment, 0u)); device.reset(nullptr); EXPECT_NE(nullptr, executionEnvironment->memoryManager); } @@ -248,11 +248,11 @@ TEST(ExecutionEnvironment, givenExecutionEnvironmentWithVariousMembersWhenItIsDe TEST(ExecutionEnvironment, givenMultipleDevicesWhenTheyAreCreatedTheyAllReuseTheSameMemoryManagerAndCommandStreamReceiver) { ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment(); - std::unique_ptr device(Device::create(nullptr, executionEnvironment, 0u)); + std::unique_ptr device(Device::create(nullptr, executionEnvironment, 0u)); auto &commandStreamReceiver = device->getCommandStreamReceiver(); auto memoryManager = device->getMemoryManager(); - std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); + std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); EXPECT_NE(&commandStreamReceiver, &device2->getCommandStreamReceiver()); EXPECT_EQ(memoryManager, device2->getMemoryManager()); } diff --git a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp index c5750ca397..1588243ee3 100644 --- a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -25,7 +25,7 @@ #include "unit_tests/mocks/mock_submissions_aggregator.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; static const char *binaryFile = "simple_block_kernel"; static const char *KernelNames[] = {"kernel_reflection", "simple_block_kernel"}; diff --git a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp index 6bb2b41b75..5957cfe1ab 100644 --- a/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp +++ b/unit_tests/execution_model/parent_kernel_dispatch_tests.cpp @@ -19,7 +19,7 @@ #include "unit_tests/mocks/mock_mdi.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; static const char *binaryFile = "simple_block_kernel"; static const char *KernelNames[] = {"kernel_reflection", "simple_block_kernel"}; diff --git a/unit_tests/execution_model/scheduler_dispatch_tests.cpp b/unit_tests/execution_model/scheduler_dispatch_tests.cpp index 1d29605a14..874c213d4c 100644 --- a/unit_tests/execution_model/scheduler_dispatch_tests.cpp +++ b/unit_tests/execution_model/scheduler_dispatch_tests.cpp @@ -19,7 +19,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; class ExecutionModelSchedulerFixture : public ExecutionModelSchedulerTest, public testing::Test { diff --git a/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp b/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp index d9c46e97ec..23280a3823 100644 --- a/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp +++ b/unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; class SubmitBlockedParentKernelFixture : public ExecutionModelSchedulerTest, public testing::Test { diff --git a/unit_tests/fixtures/buffer_enqueue_fixture.h b/unit_tests/fixtures/buffer_enqueue_fixture.h index f61a948a1c..d8d3d81f5d 100644 --- a/unit_tests/fixtures/buffer_enqueue_fixture.h +++ b/unit_tests/fixtures/buffer_enqueue_fixture.h @@ -17,7 +17,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; struct BufferEnqueueFixture : public HardwareParse, public ::testing::Test { diff --git a/unit_tests/fixtures/buffer_fixture.cpp b/unit_tests/fixtures/buffer_fixture.cpp index e54d3374e4..90f70da39e 100644 --- a/unit_tests/fixtures/buffer_fixture.cpp +++ b/unit_tests/fixtures/buffer_fixture.cpp @@ -9,7 +9,7 @@ #include "unit_tests/mocks/mock_context.h" -using OCLRT::Context; +using NEO::Context; // clang-format off static char bufferMemory[] = { diff --git a/unit_tests/fixtures/buffer_fixture.h b/unit_tests/fixtures/buffer_fixture.h index 32e01b5753..e8b7d00096 100644 --- a/unit_tests/fixtures/buffer_fixture.h +++ b/unit_tests/fixtures/buffer_fixture.h @@ -18,7 +18,7 @@ struct BufferDefaults { enum { flags = CL_MEM_READ_WRITE }; static const size_t sizeInBytes; static void *hostPtr; - static OCLRT::Context *context; + static NEO::Context *context; }; template @@ -38,9 +38,9 @@ struct BufferWriteOnly : public BaseClass { template struct BufferHelper { - using Buffer = OCLRT::Buffer; - using Context = OCLRT::Context; - using MockContext = OCLRT::MockContext; + using Buffer = NEO::Buffer; + using Context = NEO::Context; + using MockContext = NEO::MockContext; static Buffer *create(Context *context = Traits::context) { auto retVal = CL_SUCCESS; diff --git a/unit_tests/fixtures/built_in_fixture.cpp b/unit_tests/fixtures/built_in_fixture.cpp index c8a54137c4..7c1d7102cb 100644 --- a/unit_tests/fixtures/built_in_fixture.cpp +++ b/unit_tests/fixtures/built_in_fixture.cpp @@ -13,7 +13,7 @@ #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" -using namespace OCLRT; +using namespace NEO; BuiltInFixture::BuiltInFixture() : pBuiltIns(nullptr) { } diff --git a/unit_tests/fixtures/built_in_fixture.h b/unit_tests/fixtures/built_in_fixture.h index 20e1405e38..7330b9b5d9 100644 --- a/unit_tests/fixtures/built_in_fixture.h +++ b/unit_tests/fixtures/built_in_fixture.h @@ -7,17 +7,17 @@ #pragma once -namespace OCLRT { +namespace NEO { class BuiltIns; class Device; -} // namespace OCLRT +} // namespace NEO class BuiltInFixture { public: BuiltInFixture(); - void SetUp(OCLRT::Device *pDevice); + void SetUp(NEO::Device *pDevice); void TearDown(); - OCLRT::BuiltIns *pBuiltIns; + NEO::BuiltIns *pBuiltIns; }; diff --git a/unit_tests/fixtures/context_fixture.cpp b/unit_tests/fixtures/context_fixture.cpp index 6f7d38ca04..cf35fdede5 100644 --- a/unit_tests/fixtures/context_fixture.cpp +++ b/unit_tests/fixtures/context_fixture.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { ContextFixture::ContextFixture() : pContext(nullptr) { @@ -30,4 +30,4 @@ void ContextFixture::TearDown() { pContext->release(); } } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/context_fixture.h b/unit_tests/fixtures/context_fixture.h index a2acfbb9ed..a2d2529eb9 100644 --- a/unit_tests/fixtures/context_fixture.h +++ b/unit_tests/fixtures/context_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "CL/cl.h" -namespace OCLRT { +namespace NEO { class MockContext; class ContextFixture { @@ -21,4 +21,4 @@ class ContextFixture { MockContext *pContext; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/device_fixture.cpp b/unit_tests/fixtures/device_fixture.cpp index eaa655ce2b..3e24bc380b 100644 --- a/unit_tests/fixtures/device_fixture.cpp +++ b/unit_tests/fixtures/device_fixture.cpp @@ -9,13 +9,13 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { void DeviceFixture::SetUp() { hwInfoHelper = *platformDevices[0]; SetUpImpl(&hwInfoHelper); } -void DeviceFixture::SetUpImpl(const OCLRT::HardwareInfo *hardwareInfo) { +void DeviceFixture::SetUpImpl(const NEO::HardwareInfo *hardwareInfo) { pDevice = MockDevice::createWithNewExecutionEnvironment(hardwareInfo); ASSERT_NE(nullptr, pDevice); @@ -36,4 +36,4 @@ MockDevice *DeviceFixture::createWithUsDeviceId(unsigned short usDeviceId) { hwInfoHelper.pPlatform = &platformHelper; return MockDevice::createWithNewExecutionEnvironment(&hwInfoHelper); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/device_fixture.h b/unit_tests/fixtures/device_fixture.h index 4729528b90..6d982a163a 100644 --- a/unit_tests/fixtures/device_fixture.h +++ b/unit_tests/fixtures/device_fixture.h @@ -8,12 +8,12 @@ #pragma once #include "unit_tests/mocks/mock_device.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; struct DeviceFixture { void SetUp(); - void SetUpImpl(const OCLRT::HardwareInfo *hardwareInfo); + void SetUpImpl(const NEO::HardwareInfo *hardwareInfo); void TearDown(); MockDevice *createWithUsDeviceId(unsigned short usDeviceId); @@ -23,4 +23,4 @@ struct DeviceFixture { HardwareInfo hwInfoHelper = {}; PLATFORM platformHelper = {}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/device_host_queue_fixture.cpp b/unit_tests/fixtures/device_host_queue_fixture.cpp index 77bd000f0f..072b9cf777 100644 --- a/unit_tests/fixtures/device_host_queue_fixture.cpp +++ b/unit_tests/fixtures/device_host_queue_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/fixtures/device_host_queue_fixture.h" -using namespace OCLRT; +using namespace NEO; namespace DeviceHostQueue { cl_queue_properties deviceQueueProperties::minimumProperties[5] = { diff --git a/unit_tests/fixtures/device_host_queue_fixture.h b/unit_tests/fixtures/device_host_queue_fixture.h index 713c3bb5a2..ce0ef7c4b3 100644 --- a/unit_tests/fixtures/device_host_queue_fixture.h +++ b/unit_tests/fixtures/device_host_queue_fixture.h @@ -12,7 +12,7 @@ #include "test.h" #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; namespace DeviceHostQueue { struct deviceQueueProperties { diff --git a/unit_tests/fixtures/device_instrumentation_fixture.cpp b/unit_tests/fixtures/device_instrumentation_fixture.cpp index 2c2393d437..1d56904b67 100644 --- a/unit_tests/fixtures/device_instrumentation_fixture.cpp +++ b/unit_tests/fixtures/device_instrumentation_fixture.cpp @@ -10,11 +10,11 @@ #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/mocks/mock_device.h" -namespace OCLRT { +namespace NEO { void DeviceInstrumentationFixture::SetUp(bool instrumentation) { ExecutionEnvironment *executionEnvironment = getExecutionEnvironmentImpl(hwInfo); if (instrumentation) hwInfo->capabilityTable.instrumentationEnabled = true; device = std::unique_ptr(Device::create(&hwInfo[0], executionEnvironment, 0)); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/fixtures/device_instrumentation_fixture.h b/unit_tests/fixtures/device_instrumentation_fixture.h index 7d2a3ba732..378ef293cc 100644 --- a/unit_tests/fixtures/device_instrumentation_fixture.h +++ b/unit_tests/fixtures/device_instrumentation_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include -namespace OCLRT { +namespace NEO { class Device; struct HardwareInfo; @@ -18,4 +18,4 @@ struct DeviceInstrumentationFixture { std::unique_ptr device = nullptr; HardwareInfo *hwInfo = nullptr; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/fixtures/enqueue_handler_fixture.h b/unit_tests/fixtures/enqueue_handler_fixture.h index b3b19978e5..bdd57f7131 100644 --- a/unit_tests/fixtures/enqueue_handler_fixture.h +++ b/unit_tests/fixtures/enqueue_handler_fixture.h @@ -11,17 +11,17 @@ #include "gtest/gtest.h" -class EnqueueHandlerTest : public OCLRT::DeviceFixture, +class EnqueueHandlerTest : public NEO::DeviceFixture, public testing::Test { public: void SetUp() override { DeviceFixture::SetUp(); - context = new OCLRT::MockContext(pDevice); + context = new NEO::MockContext(pDevice); } void TearDown() override { context->decRefInternal(); DeviceFixture::TearDown(); } - OCLRT::MockContext *context; + NEO::MockContext *context; }; diff --git a/unit_tests/fixtures/execution_model_kernel_fixture.h b/unit_tests/fixtures/execution_model_kernel_fixture.h index 9f1942c9bc..b599cc4caf 100644 --- a/unit_tests/fixtures/execution_model_kernel_fixture.h +++ b/unit_tests/fixtures/execution_model_kernel_fixture.h @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/program/program_from_binary.h" -using namespace OCLRT; +using namespace NEO; class ExecutionModelKernelFixture : public ProgramFromBinaryTest, public PlatformFixture { diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h index c86c6ca3d0..0c4f963a63 100644 --- a/unit_tests/fixtures/hello_world_fixture.h +++ b/unit_tests/fixtures/hello_world_fixture.h @@ -17,14 +17,14 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" -namespace OCLRT { +namespace NEO { // Factory used to pick various ingredients for use in aggregate tests struct HelloWorldFixtureFactory { - typedef OCLRT::IndirectHeapFixture IndirectHeapFixture; - typedef OCLRT::CommandStreamFixture CommandStreamFixture; - typedef OCLRT::CommandQueueHwFixture CommandQueueFixture; - typedef OCLRT::HelloWorldKernelFixture KernelFixture; + typedef NEO::IndirectHeapFixture IndirectHeapFixture; + typedef NEO::CommandStreamFixture CommandStreamFixture; + typedef NEO::CommandQueueHwFixture CommandQueueFixture; + typedef NEO::HelloWorldKernelFixture KernelFixture; }; // Instantiates a fixture based on the supplied fixture factory. @@ -144,4 +144,4 @@ struct HelloWorldTest : Test> { template struct HelloWorldTestWithParam : HelloWorldFixture { }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/hello_world_kernel_fixture.h b/unit_tests/fixtures/hello_world_kernel_fixture.h index 03aca63c3a..796e2ab9bc 100644 --- a/unit_tests/fixtures/hello_world_kernel_fixture.h +++ b/unit_tests/fixtures/hello_world_kernel_fixture.h @@ -21,7 +21,7 @@ #include "CL/cl.h" #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class Kernel; class Program; @@ -100,4 +100,4 @@ struct HelloWorldKernelFixture : public ProgramFixture { Kernel *pKernel = nullptr; MockContext *pContext = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/image_fixture.cpp b/unit_tests/fixtures/image_fixture.cpp index 7c63271ee5..9cf4bba94b 100644 --- a/unit_tests/fixtures/image_fixture.cpp +++ b/unit_tests/fixtures/image_fixture.cpp @@ -9,7 +9,7 @@ #include "unit_tests/mocks/mock_context.h" -using OCLRT::MockContext; +using NEO::MockContext; static const size_t imageWidth = 7; static const size_t imageHeight = 9; @@ -88,4 +88,4 @@ static float imageMemory[imageWidth * imageHeight * imageDepth] = {}; void *Image1dDefaults::hostPtr = imageMemory; -OCLRT::Context *Image1dDefaults::context = nullptr; +NEO::Context *Image1dDefaults::context = nullptr; diff --git a/unit_tests/fixtures/image_fixture.h b/unit_tests/fixtures/image_fixture.h index d43a6c0654..65a3784e59 100644 --- a/unit_tests/fixtures/image_fixture.h +++ b/unit_tests/fixtures/image_fixture.h @@ -25,7 +25,7 @@ struct Image1dDefaults { static const cl_image_format imageFormat; static const cl_image_desc imageDesc; static void *hostPtr; - static OCLRT::Context *context; + static NEO::Context *context; }; struct Image2dDefaults : public Image1dDefaults { @@ -65,9 +65,9 @@ struct ImageWriteOnly : public BaseClass { template struct ImageHelper { - using Context = OCLRT::Context; - using Image = OCLRT::Image; - using MockContext = OCLRT::MockContext; + using Context = NEO::Context; + using Image = NEO::Image; + using MockContext = NEO::MockContext; static Image *create(Context *context = Traits::context, const cl_image_desc *imgDesc = &Traits::imageDesc, const cl_image_format *imgFormat = &Traits::imageFormat) { @@ -109,19 +109,19 @@ struct Image1dArrayHelper : public ImageHelper { template class ImageClearColorFixture { public: - using GmmHelper = OCLRT::GmmHelper; - using MockContext = OCLRT::MockContext; - using Image = OCLRT::Image; - using ImageHw = OCLRT::ImageHw; + using GmmHelper = NEO::GmmHelper; + using MockContext = NEO::MockContext; + using Image = NEO::Image; + using ImageHw = NEO::ImageHw; using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; using AUXILIARY_SURFACE_MODE = typename FamilyType::RENDER_SURFACE_STATE::AUXILIARY_SURFACE_MODE; void SetUp() { hwInfoHelper.hwInfo.capabilityTable.ftrRenderCompressedImages = true; - OCLRT::platformImpl.reset(); - OCLRT::constructPlatform()->peekExecutionEnvironment()->setHwInfo(&hwInfoHelper.hwInfo); - OCLRT::platform()->peekExecutionEnvironment()->initGmm(); + NEO::platformImpl.reset(); + NEO::constructPlatform()->peekExecutionEnvironment()->setHwInfo(&hwInfoHelper.hwInfo); + NEO::platform()->peekExecutionEnvironment()->initGmm(); surfaceState = FamilyType::cmdInitRenderSurfaceState; surfaceState.setAuxiliarySurfaceMode(AUXILIARY_SURFACE_MODE::AUXILIARY_SURFACE_MODE_AUX_CCS_E); diff --git a/unit_tests/fixtures/kernel_arg_fixture.cpp b/unit_tests/fixtures/kernel_arg_fixture.cpp index 24e3f90b10..314851b844 100644 --- a/unit_tests/fixtures/kernel_arg_fixture.cpp +++ b/unit_tests/fixtures/kernel_arg_fixture.cpp @@ -17,7 +17,7 @@ KernelImageArgTest::~KernelImageArgTest() = default; void KernelImageArgTest::SetUp() { - pKernelInfo = std::make_unique(); + pKernelInfo = std::make_unique(); KernelArgPatchInfo kernelArgPatchInfo; kernelHeader.reset(new iOpenCL::SKernelBinaryHeaderCommon{}); @@ -51,21 +51,21 @@ void KernelImageArgTest::SetUp() { pKernelInfo->kernelArgInfo[0].isImage = true; DeviceFixture::SetUp(); - program = std::make_unique(*pDevice->getExecutionEnvironment()); - pKernel.reset(new OCLRT::MockKernel(program.get(), *pKernelInfo, *pDevice)); + program = std::make_unique(*pDevice->getExecutionEnvironment()); + pKernel.reset(new NEO::MockKernel(program.get(), *pKernelInfo, *pDevice)); ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); - pKernel->setKernelArgHandler(0, &OCLRT::Kernel::setArgImage); - pKernel->setKernelArgHandler(1, &OCLRT::Kernel::setArgImage); - pKernel->setKernelArgHandler(2, &OCLRT::Kernel::setArgImmediate); - pKernel->setKernelArgHandler(3, &OCLRT::Kernel::setArgImage); - pKernel->setKernelArgHandler(4, &OCLRT::Kernel::setArgImage); + pKernel->setKernelArgHandler(0, &NEO::Kernel::setArgImage); + pKernel->setKernelArgHandler(1, &NEO::Kernel::setArgImage); + pKernel->setKernelArgHandler(2, &NEO::Kernel::setArgImmediate); + pKernel->setKernelArgHandler(3, &NEO::Kernel::setArgImage); + pKernel->setKernelArgHandler(4, &NEO::Kernel::setArgImage); uint32_t crossThreadData[0x44] = {}; crossThreadData[0x20 / sizeof(uint32_t)] = 0x12344321; pKernel->setCrossThreadData(crossThreadData, sizeof(crossThreadData)); - context.reset(new OCLRT::MockContext(pDevice)); + context.reset(new NEO::MockContext(pDevice)); image.reset(Image2dHelper<>::create(context.get())); ASSERT_NE(nullptr, image); } diff --git a/unit_tests/fixtures/kernel_arg_fixture.h b/unit_tests/fixtures/kernel_arg_fixture.h index b20ecd6367..c4df460caa 100644 --- a/unit_tests/fixtures/kernel_arg_fixture.h +++ b/unit_tests/fixtures/kernel_arg_fixture.h @@ -12,19 +12,19 @@ #include -namespace OCLRT { +namespace NEO { class MockContext; class MockKernel; class MockProgram; class Image; struct KernelInfo; -} // namespace OCLRT +} // namespace NEO namespace iOpenCL { struct SKernelBinaryHeaderCommon; } -class KernelImageArgTest : public Test { +class KernelImageArgTest : public Test { public: KernelImageArgTest() { } @@ -38,11 +38,11 @@ class KernelImageArgTest : public Test { cl_int retVal = 0; std::unique_ptr kernelHeader; - std::unique_ptr context; - std::unique_ptr program; - std::unique_ptr pKernelInfo; - std::unique_ptr pKernel; - std::unique_ptr image; + std::unique_ptr context; + std::unique_ptr program; + std::unique_ptr pKernelInfo; + std::unique_ptr pKernel; + std::unique_ptr image; char surfaceStateHeap[0x80]; uint32_t offsetNumMipLevelsImage0 = -1; diff --git a/unit_tests/fixtures/kernel_data_fixture.h b/unit_tests/fixtures/kernel_data_fixture.h index fd51b3aea0..0dc1d67669 100644 --- a/unit_tests/fixtures/kernel_data_fixture.h +++ b/unit_tests/fixtures/kernel_data_fixture.h @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; using namespace iOpenCL; class KernelDataTest : public testing::Test { diff --git a/unit_tests/fixtures/media_kernel_fixture.h b/unit_tests/fixtures/media_kernel_fixture.h index ae483dc50f..028a720f50 100644 --- a/unit_tests/fixtures/media_kernel_fixture.h +++ b/unit_tests/fixtures/media_kernel_fixture.h @@ -10,7 +10,7 @@ #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/helpers/hw_parse.h" -namespace OCLRT { +namespace NEO { template struct MediaKernelFixture : public HelloWorldFixture, @@ -89,4 +89,4 @@ struct MediaKernelFixture : public HelloWorldFixture, Kernel *pVmeKernel = nullptr; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/memory_allocator_fixture.h b/unit_tests/fixtures/memory_allocator_fixture.h index d7c68ad350..26560ba17d 100644 --- a/unit_tests/fixtures/memory_allocator_fixture.h +++ b/unit_tests/fixtures/memory_allocator_fixture.h @@ -15,7 +15,7 @@ #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; class MemoryAllocatorFixture : public MemoryManagementFixture { public: diff --git a/unit_tests/fixtures/memory_management_fixture.cpp b/unit_tests/fixtures/memory_management_fixture.cpp index c5a0ef30e8..c88d88c797 100644 --- a/unit_tests/fixtures/memory_management_fixture.cpp +++ b/unit_tests/fixtures/memory_management_fixture.cpp @@ -39,7 +39,7 @@ void MemoryManagementFixture::SetUp() { MemoryManagement::indexDeallocation = 0; MemoryManagement::failingAllocation = -1; previousAllocations = MemoryManagement::numAllocations.load(); - MemoryManagement::logTraces = OCLRT::captureCallStacks; + MemoryManagement::logTraces = NEO::captureCallStacks; } void MemoryManagementFixture::TearDown() { @@ -127,7 +127,7 @@ std::string printCallStack(const MemoryManagement::AllocationEvent &event) { std::string result = ""; printf("printCallStack.%d.%d\n", printMemoryOpCallStack, event.frames); - if (!OCLRT::captureCallStacks) { + if (!NEO::captureCallStacks) { printf("for detailed stack information turn on captureCallStacks in memory_management_fixture.h\n"); } if (printMemoryOpCallStack && event.frames > 0) { diff --git a/unit_tests/fixtures/memory_manager_fixture.cpp b/unit_tests/fixtures/memory_manager_fixture.cpp index 1506f08e51..617b457bb6 100644 --- a/unit_tests/fixtures/memory_manager_fixture.cpp +++ b/unit_tests/fixtures/memory_manager_fixture.cpp @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; void MemoryManagerWithCsrFixture::SetUp() { csr = new MockCommandStreamReceiver(this->executionEnvironment); diff --git a/unit_tests/fixtures/memory_manager_fixture.h b/unit_tests/fixtures/memory_manager_fixture.h index 225dca8566..2bdedf5938 100644 --- a/unit_tests/fixtures/memory_manager_fixture.h +++ b/unit_tests/fixtures/memory_manager_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,12 +9,12 @@ #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/options.h" -using namespace OCLRT; +using namespace NEO; class MockCommandStreamReceiver; -namespace OCLRT { +namespace NEO { class MockMemoryManager; -}; // namespace OCLRT +}; // namespace NEO class MemoryManagerWithCsrFixture { public: diff --git a/unit_tests/fixtures/platform_fixture.cpp b/unit_tests/fixtures/platform_fixture.cpp index 29b3c3dff4..8624b8b3cf 100644 --- a/unit_tests/fixtures/platform_fixture.cpp +++ b/unit_tests/fixtures/platform_fixture.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { PlatformFixture::PlatformFixture() : pPlatform(nullptr), num_devices(0), devices(nullptr) { @@ -45,4 +45,4 @@ void PlatformFixture::TearDown() { platformImpl.reset(nullptr); delete[] devices; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/platform_fixture.h b/unit_tests/fixtures/platform_fixture.h index 634fb60a41..d79bc67f4f 100644 --- a/unit_tests/fixtures/platform_fixture.h +++ b/unit_tests/fixtures/platform_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/api/cl_types.h" #include "runtime/platform/platform.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; @@ -26,4 +26,4 @@ class PlatformFixture { cl_uint num_devices; cl_device_id *devices; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/preemption_fixture.cpp b/unit_tests/fixtures/preemption_fixture.cpp index bdaaf78d71..afda83b427 100644 --- a/unit_tests/fixtures/preemption_fixture.cpp +++ b/unit_tests/fixtures/preemption_fixture.cpp @@ -24,7 +24,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; DevicePreemptionTests::DevicePreemptionTests() = default; DevicePreemptionTests::~DevicePreemptionTests() = default; diff --git a/unit_tests/fixtures/preemption_fixture.h b/unit_tests/fixtures/preemption_fixture.h index 1a7b8f1b75..f554685b3f 100644 --- a/unit_tests/fixtures/preemption_fixture.h +++ b/unit_tests/fixtures/preemption_fixture.h @@ -22,7 +22,7 @@ namespace iOpenCL { struct SPatchExecutionEnvironment; } -namespace OCLRT { +namespace NEO { class DispatchInfo; class MockCommandQueue; class MockContext; @@ -34,7 +34,7 @@ struct WorkaroundTable; using PreemptionEnqueueKernelFixture = HelloWorldFixture; using PreemptionEnqueueKernelTest = Test; -} // namespace OCLRT +} // namespace NEO class DevicePreemptionTests : public ::testing::Test { public: @@ -45,43 +45,43 @@ class DevicePreemptionTests : public ::testing::Test { DevicePreemptionTests(); ~DevicePreemptionTests() override; - OCLRT::PreemptionMode preemptionMode; - OCLRT::WorkaroundTable *waTable = nullptr; - std::unique_ptr dispatchInfo; - std::unique_ptr kernel; - std::unique_ptr cmdQ; - std::unique_ptr device; - std::unique_ptr context; + NEO::PreemptionMode preemptionMode; + NEO::WorkaroundTable *waTable = nullptr; + std::unique_ptr dispatchInfo; + std::unique_ptr kernel; + std::unique_ptr cmdQ; + std::unique_ptr device; + std::unique_ptr context; std::unique_ptr dbgRestore; std::unique_ptr executionEnvironment; - std::unique_ptr program; - std::unique_ptr kernelInfo; + std::unique_ptr program; + std::unique_ptr kernelInfo; }; -struct ThreadGroupPreemptionEnqueueKernelTest : OCLRT::PreemptionEnqueueKernelTest { +struct ThreadGroupPreemptionEnqueueKernelTest : NEO::PreemptionEnqueueKernelTest { void SetUp() override; void TearDown() override; - OCLRT::HardwareInfo *globalHwInfo; - OCLRT::PreemptionMode originalPreemptionMode; + NEO::HardwareInfo *globalHwInfo; + NEO::PreemptionMode originalPreemptionMode; std::unique_ptr dbgRestore; }; -struct MidThreadPreemptionEnqueueKernelTest : OCLRT::PreemptionEnqueueKernelTest { +struct MidThreadPreemptionEnqueueKernelTest : NEO::PreemptionEnqueueKernelTest { void SetUp() override; void TearDown() override; - OCLRT::HardwareInfo *globalHwInfo; - OCLRT::PreemptionMode originalPreemptionMode; + NEO::HardwareInfo *globalHwInfo; + NEO::PreemptionMode originalPreemptionMode; std::unique_ptr dbgRestore; }; struct PreemptionTestHwDetails { struct PreemptionModeHashT { - auto operator()(const OCLRT::PreemptionMode &preemptionMode) const -> std::underlying_type::type { - return static_cast::type>(preemptionMode); + auto operator()(const NEO::PreemptionMode &preemptionMode) const -> std::underlying_type::type { + return static_cast::type>(preemptionMode); } }; @@ -90,7 +90,7 @@ struct PreemptionTestHwDetails { } uint32_t regAddress = 0; - std::unordered_map modeToRegValueMap; + std::unordered_map modeToRegValueMap; uint32_t defaultRegValue = 0; }; diff --git a/unit_tests/fixtures/program_fixture.cpp b/unit_tests/fixtures/program_fixture.cpp index e02bd23e32..1f0ee235e6 100644 --- a/unit_tests/fixtures/program_fixture.cpp +++ b/unit_tests/fixtures/program_fixture.cpp @@ -10,13 +10,13 @@ #include "runtime/program/create.inl" #include "unit_tests/mocks/mock_program.h" -namespace OCLRT { +namespace NEO { -template OCLRT::MockProgram *Program::create(cl_context, cl_uint, const char **, const size_t *, cl_int &); -template OCLRT::MockProgram *Program::create(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int &); -template OCLRT::MockProgram *Program::create(const char *, Context *, Device &, bool, cl_int *); +template NEO::MockProgram *Program::create(cl_context, cl_uint, const char **, const size_t *, cl_int &); +template NEO::MockProgram *Program::create(cl_context, cl_uint, const cl_device_id *, const size_t *, const unsigned char **, cl_int *, cl_int &); +template NEO::MockProgram *Program::create(const char *, Context *, Device &, bool, cl_int *); template void ProgramFixture::CreateProgramFromBinary(cl_context, cl_device_id *, const std::string &, const std::string &); template void ProgramFixture::CreateProgramFromBinary(cl_context, cl_device_id *, const std::string &, cl_int &, const std::string &); template void ProgramFixture::CreateProgramFromBinary(cl_context, cl_device_id *, const std::string &, const std::string &); template void ProgramFixture::CreateProgramFromBinary(cl_context, cl_device_id *, const std::string &, cl_int &, const std::string &); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/program_fixture.h b/unit_tests/fixtures/program_fixture.h index b820c60f24..7b67060701 100644 --- a/unit_tests/fixtures/program_fixture.h +++ b/unit_tests/fixtures/program_fixture.h @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class ProgramFixture { public: @@ -86,4 +86,4 @@ class ProgramFixture { void *knownSource; size_t knownSourceSize; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/program_fixture.inl b/unit_tests/fixtures/program_fixture.inl index 647d595b9c..17c2d538d4 100644 --- a/unit_tests/fixtures/program_fixture.inl +++ b/unit_tests/fixtures/program_fixture.inl @@ -7,7 +7,7 @@ #include "unit_tests/fixtures/program_fixture.h" -namespace OCLRT { +namespace NEO { template void ProgramFixture::CreateProgramFromBinary(cl_context context, @@ -54,4 +54,4 @@ void ProgramFixture::CreateProgramFromBinary(cl_context pContext, ASSERT_NE(nullptr, pProgram); ASSERT_EQ(CL_SUCCESS, retVal); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/run_kernel_fixture.h b/unit_tests/fixtures/run_kernel_fixture.h index f83df6bcd7..07592a6e58 100644 --- a/unit_tests/fixtures/run_kernel_fixture.h +++ b/unit_tests/fixtures/run_kernel_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "unit_tests/global_environment.h" #include "unit_tests/helpers/test_files.h" -namespace OCLRT { +namespace NEO { struct CommandQueueHwFixture; struct CommandStreamFixture; @@ -39,8 +39,8 @@ inline void restoreBuiltInBinaryName(Device *pDevice) { } struct RunKernelFixtureFactory { - typedef OCLRT::CommandStreamFixture CommandStreamFixture; - typedef OCLRT::CommandQueueHwFixture CommandQueueFixture; + typedef NEO::CommandStreamFixture CommandStreamFixture; + typedef NEO::CommandQueueHwFixture CommandQueueFixture; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/scenario_test_fixture.h b/unit_tests/fixtures/scenario_test_fixture.h index a15cdf46b6..bc361017c8 100644 --- a/unit_tests/fixtures/scenario_test_fixture.h +++ b/unit_tests/fixtures/scenario_test_fixture.h @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class ScenarioTest : public ::testing::Test, public PlatformFixture { diff --git a/unit_tests/fixtures/simple_arg_fixture.h b/unit_tests/fixtures/simple_arg_fixture.h index e85248a5ac..406952b036 100644 --- a/unit_tests/fixtures/simple_arg_fixture.h +++ b/unit_tests/fixtures/simple_arg_fixture.h @@ -14,12 +14,12 @@ #include "unit_tests/fixtures/simple_arg_kernel_fixture.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" -namespace OCLRT { +namespace NEO { struct SimpleArgFixtureFactory { - typedef OCLRT::IndirectHeapFixture IndirectHeapFixture; - typedef OCLRT::CommandStreamFixture CommandStreamFixture; - typedef OCLRT::CommandQueueHwFixture CommandQueueFixture; - typedef OCLRT::SimpleArgKernelFixture KernelFixture; + typedef NEO::IndirectHeapFixture IndirectHeapFixture; + typedef NEO::CommandStreamFixture CommandStreamFixture; + typedef NEO::CommandQueueHwFixture CommandQueueFixture; + typedef NEO::SimpleArgKernelFixture KernelFixture; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/simple_arg_kernel_fixture.h b/unit_tests/fixtures/simple_arg_kernel_fixture.h index b1649e57f3..71e5709cd9 100644 --- a/unit_tests/fixtures/simple_arg_kernel_fixture.h +++ b/unit_tests/fixtures/simple_arg_kernel_fixture.h @@ -22,7 +22,7 @@ #include -namespace OCLRT { +namespace NEO { class Kernel; class Program; @@ -243,4 +243,4 @@ class SimpleKernelFixture : public ProgramFixture { std::array, maxKernelsCount> kernels; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/two_walker_fixture.h b/unit_tests/fixtures/two_walker_fixture.h index 61df3b16bf..8ac587e577 100644 --- a/unit_tests/fixtures/two_walker_fixture.h +++ b/unit_tests/fixtures/two_walker_fixture.h @@ -11,7 +11,7 @@ #include "hello_world_fixture.h" -namespace OCLRT { +namespace NEO { // Generates two back-to-back walkers using the same kernel for testing purposes template @@ -65,4 +65,4 @@ struct TwoWalkerTest GenCmdList::iterator itorWalker1; GenCmdList::iterator itorWalker2; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h index a960488c92..1e47c51152 100644 --- a/unit_tests/fixtures/ult_command_stream_receiver_fixture.h +++ b/unit_tests/fixtures/ult_command_stream_receiver_fixture.h @@ -16,7 +16,7 @@ #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -namespace OCLRT { +namespace NEO { struct UltCommandStreamReceiverTest : public DeviceFixture, @@ -149,4 +149,4 @@ struct UltCommandStreamReceiverTest uint32_t latestSentNonDcFlushTaskCount; uint32_t dcFlushRequiredTaskCount; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen10/cmd_parse_gen10.cpp b/unit_tests/gen10/cmd_parse_gen10.cpp index 6e22737434..aab697531c 100644 --- a/unit_tests/gen10/cmd_parse_gen10.cpp +++ b/unit_tests/gen10/cmd_parse_gen10.cpp @@ -8,8 +8,8 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -using GenStruct = OCLRT::GEN10; -using GenGfxFamily = OCLRT::CNLFamily; +using GenStruct = NEO::GEN10; +using GenGfxFamily = NEO::CNLFamily; #include "unit_tests/gen_common/cmd_parse_base.inl" #include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" #include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" @@ -82,8 +82,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; -namespace OCLRT { +namespace NEO { template void HardwareParse::findHardwareCommands(); template void HardwareParse::findHardwareCommands(IndirectHeap *); template const void *HardwareParse::getStatelessArgumentPointer(const Kernel &kernel, uint32_t indexArg, IndirectHeap &ioh); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen10/coherency_tests_gen10.cpp b/unit_tests/gen10/coherency_tests_gen10.cpp index 51de959d7d..94c91f9ac5 100644 --- a/unit_tests/gen10/coherency_tests_gen10.cpp +++ b/unit_tests/gen10/coherency_tests_gen10.cpp @@ -12,7 +12,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device.h" -using namespace OCLRT; +using namespace NEO; struct Gen10CoherencyRequirements : public ::testing::Test { typedef typename CNLFamily::MI_LOAD_REGISTER_IMM MI_LOAD_REGISTER_IMM; diff --git a/unit_tests/gen10/command_stream_receiver_hw_tests_gen10.cpp b/unit_tests/gen10/command_stream_receiver_hw_tests_gen10.cpp index 90600ea53c..0cbabc5e6e 100644 --- a/unit_tests/gen10/command_stream_receiver_hw_tests_gen10.cpp +++ b/unit_tests/gen10/command_stream_receiver_hw_tests_gen10.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; #include "unit_tests/command_stream/command_stream_receiver_hw_tests.inl" diff --git a/unit_tests/gen10/enqueue_kernel_gen10.cpp b/unit_tests/gen10/enqueue_kernel_gen10.cpp index 1412476db4..6c02158e4c 100644 --- a/unit_tests/gen10/enqueue_kernel_gen10.cpp +++ b/unit_tests/gen10/enqueue_kernel_gen10.cpp @@ -14,7 +14,7 @@ #include "reg_configs_common.h" -namespace OCLRT { +namespace NEO { using Gen10EnqueueTest = Test; GEN10TEST_F(Gen10EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenDefaultPolicyIsProgrammed) { @@ -50,4 +50,4 @@ GEN10TEST_F(Gen10EnqueueTest, givenKernelNotRequiringIndependentForwardProgressW EXPECT_EQ(RowChickenReg4::regDataForArbitrationPolicy[ThreadArbitrationPolicy::AgeBased], cmd->getDataDword()); EXPECT_EQ(1U, countMmio(hwParser.cmdList.begin(), hwParser.cmdList.end(), RowChickenReg4::address)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen10/enqueue_media_kernel_gen10.cpp b/unit_tests/gen10/enqueue_media_kernel_gen10.cpp index abe26463e1..807c8d1ec7 100644 --- a/unit_tests/gen10/enqueue_media_kernel_gen10.cpp +++ b/unit_tests/gen10/enqueue_media_kernel_gen10.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/media_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef MediaKernelFixture MediaKernelTest; GEN10TEST_F(MediaKernelTest, givenGen10CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { diff --git a/unit_tests/gen10/image_tests_gen10.cpp b/unit_tests/gen10/image_tests_gen10.cpp index e24284c665..5a9bbc1a96 100644 --- a/unit_tests/gen10/image_tests_gen10.cpp +++ b/unit_tests/gen10/image_tests_gen10.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test gen10ImageTests; diff --git a/unit_tests/gen10/kernel_tests_gen10.cpp b/unit_tests/gen10/kernel_tests_gen10.cpp index f5c8e2fcb8..ca11634d24 100644 --- a/unit_tests/gen10/kernel_tests_gen10.cpp +++ b/unit_tests/gen10/kernel_tests_gen10.cpp @@ -10,7 +10,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; using Gen10KernelTest = Test; GEN10TEST_F(Gen10KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { diff --git a/unit_tests/gen10/linux/dll/device_id_tests_gen10.cpp b/unit_tests/gen10/linux/dll/device_id_tests_gen10.cpp index 401fd35293..cd206c2107 100644 --- a/unit_tests/gen10/linux/dll/device_id_tests_gen10.cpp +++ b/unit_tests/gen10/linux/dll/device_id_tests_gen10.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(CnlDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp b/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp index 756894e696..2ed8f39b51 100644 --- a/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp +++ b/unit_tests/gen10/linux/hw_info_config_tests_gen10.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxCnl : HwInfoConfigTestLinux { diff --git a/unit_tests/gen10/preamble_tests_gen10.cpp b/unit_tests/gen10/preamble_tests_gen10.cpp index 8bfbf4cd15..4822b9b583 100644 --- a/unit_tests/gen10/preamble_tests_gen10.cpp +++ b/unit_tests/gen10/preamble_tests_gen10.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef CNLFamily GfxFamily; #include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" diff --git a/unit_tests/gen10/sampler_tests_gen10.cpp b/unit_tests/gen10/sampler_tests_gen10.cpp index 747c4a041d..301529b53a 100644 --- a/unit_tests/gen10/sampler_tests_gen10.cpp +++ b/unit_tests/gen10/sampler_tests_gen10.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test Gen10SamplerTest; diff --git a/unit_tests/gen10/scheduler_source_tests_gen10.cpp b/unit_tests/gen10/scheduler_source_tests_gen10.cpp index 896987686b..c2e6c8d7b6 100644 --- a/unit_tests/gen10/scheduler_source_tests_gen10.cpp +++ b/unit_tests/gen10/scheduler_source_tests_gen10.cpp @@ -16,7 +16,7 @@ // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them #include "unit_tests/scheduler/scheduler_source_tests.inl" -using namespace OCLRT; +using namespace NEO; typedef SchedulerSourceTest SchedulerSourceTestGen10; GEN10TEST_F(SchedulerSourceTestGen10, GivenDeviceQueueWhenCommandsSizeIsCalculatedThenItEqualsSpaceForEachEnqueueInSchedulerKernelCode) { diff --git a/unit_tests/gen10/test_device_caps_gen10.cpp b/unit_tests/gen10/test_device_caps_gen10.cpp index 23ef988640..0686b3231a 100644 --- a/unit_tests/gen10/test_device_caps_gen10.cpp +++ b/unit_tests/gen10/test_device_caps_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test Gen10DeviceCaps; @@ -76,7 +76,7 @@ CNLTEST_F(CnlUsDeviceIdTest, isSimulationCap) { ICNL_13x8_DESK_DEVICE_F0_ID, 0, // default, non-simulation }; - OCLRT::MockDevice *mockDevice = nullptr; + NEO::MockDevice *mockDevice = nullptr; for (auto id : cnlSimulationIds) { mockDevice = createWithUsDeviceId(id); diff --git a/unit_tests/gen10/test_device_queue_hw_gen10.cpp b/unit_tests/gen10/test_device_queue_hw_gen10.cpp index 02b851616e..dcede02475 100644 --- a/unit_tests/gen10/test_device_queue_hw_gen10.cpp +++ b/unit_tests/gen10/test_device_queue_hw_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device_queue.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; typedef DeviceQueueHwTest Gen10DeviceQueueSlb; diff --git a/unit_tests/gen10/test_hw_info_config_cnl.cpp b/unit_tests/gen10/test_hw_info_config_cnl.cpp index ed1ddbfea7..095167f522 100644 --- a/unit_tests/gen10/test_hw_info_config_cnl.cpp +++ b/unit_tests/gen10/test_hw_info_config_cnl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(CnlHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_CANNONLAKE != productFamily) { diff --git a/unit_tests/gen10/test_platform_caps_gen10.cpp b/unit_tests/gen10/test_platform_caps_gen10.cpp index bc4021cfd8..d303e60b8b 100644 --- a/unit_tests/gen10/test_platform_caps_gen10.cpp +++ b/unit_tests/gen10/test_platform_caps_gen10.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -using namespace OCLRT; +using namespace NEO; struct Gen10PlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { diff --git a/unit_tests/gen10/test_preamble_gen10.cpp b/unit_tests/gen10/test_preamble_gen10.cpp index f8607b5019..a2ba91b6a3 100644 --- a/unit_tests/gen10/test_preamble_gen10.cpp +++ b/unit_tests/gen10/test_preamble_gen10.cpp @@ -12,12 +12,12 @@ #include "reg_configs_common.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; extern const HardwareInfo **platformDevices; -} // namespace OCLRT +} // namespace NEO -using namespace OCLRT; +using namespace NEO; typedef PreambleFixture CnlSlm; @@ -43,7 +43,7 @@ struct CnlPreambleWaCmds : public PreambleFixture { memset(reinterpret_cast(&waTable), 0, sizeof(waTable)); } void SetUp() override { - pHwInfo = const_cast(*OCLRT::platformDevices); + pHwInfo = const_cast(*NEO::platformDevices); pOldWaTable = pHwInfo->pWaTable; pHwInfo->pWaTable = &waTable; diff --git a/unit_tests/gen10/test_preemption_gen10.cpp b/unit_tests/gen10/test_preemption_gen10.cpp index dfa01b6681..3fd391e339 100644 --- a/unit_tests/gen10/test_preemption_gen10.cpp +++ b/unit_tests/gen10/test_preemption_gen10.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -namespace OCLRT { +namespace NEO { template <> void HardwareParse::findCsrBaseAddress() { @@ -26,9 +26,9 @@ void HardwareParse::findCsrBaseAddress() { cmdGpgpuCsrBaseAddress = *itorGpgpuCsrBaseAddress; } } -} // namespace OCLRT +} // namespace NEO -using namespace OCLRT; +using namespace NEO; using Gen10PreemptionTests = DevicePreemptionTests; using Gen10PreemptionEnqueueKernelTest = PreemptionEnqueueKernelTest; diff --git a/unit_tests/gen10/test_sample_gen10.cpp b/unit_tests/gen10/test_sample_gen10.cpp index 0fa51c2406..9dc09107a6 100644 --- a/unit_tests/gen10/test_sample_gen10.cpp +++ b/unit_tests/gen10/test_sample_gen10.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test CannonlakeOnlyTest; diff --git a/unit_tests/gen10/unit_test_helper_gen10.cpp b/unit_tests/gen10/unit_test_helper_gen10.cpp index 17f140380f..0473059409 100644 --- a/unit_tests/gen10/unit_test_helper_gen10.cpp +++ b/unit_tests/gen10/unit_test_helper_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" -namespace OCLRT { +namespace NEO { template struct UnitTestHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen10/windows/gmm_callbacks_tests_gen10.cpp b/unit_tests/gen10/windows/gmm_callbacks_tests_gen10.cpp index 13adf60f03..86a9913295 100644 --- a/unit_tests/gen10/windows/gmm_callbacks_tests_gen10.cpp +++ b/unit_tests/gen10/windows/gmm_callbacks_tests_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/helpers/gmm_callbacks.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test Gen10GmmCallbacksTests; diff --git a/unit_tests/gen10/windows/hw_info_config_tests_gen10.cpp b/unit_tests/gen10/windows/hw_info_config_tests_gen10.cpp index ba3d975d4e..44bde58d46 100644 --- a/unit_tests/gen10/windows/hw_info_config_tests_gen10.cpp +++ b/unit_tests/gen10/windows/hw_info_config_tests_gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsCnl = HwInfoConfigTestWindows; diff --git a/unit_tests/gen8/bdw/device_tests_bdw.cpp b/unit_tests/gen8/bdw/device_tests_bdw.cpp index f686bb7ecf..170288ae79 100644 --- a/unit_tests/gen8/bdw/device_tests_bdw.cpp +++ b/unit_tests/gen8/bdw/device_tests_bdw.cpp @@ -10,7 +10,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_source_level_debugger.h" -using namespace OCLRT; +using namespace NEO; struct BdwDeviceTest : public DeviceFixture, public ::testing::Test { void SetUp() override { diff --git a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp b/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp index 7607425f7b..d189f08af6 100644 --- a/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp +++ b/unit_tests/gen8/bdw/linux/dll/device_id_tests_bdw.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(BdwDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp index f84b3749f7..0ace437934 100644 --- a/unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp +++ b/unit_tests/gen8/bdw/linux/hw_info_config_tests_bdw.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxBdw : HwInfoConfigTestLinux { diff --git a/unit_tests/gen8/bdw/test_device_caps_bdw.cpp b/unit_tests/gen8/bdw/test_device_caps_bdw.cpp index d95517c89a..1421c5650d 100644 --- a/unit_tests/gen8/bdw/test_device_caps_bdw.cpp +++ b/unit_tests/gen8/bdw/test_device_caps_bdw.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test BdwDeviceCaps; @@ -68,7 +68,7 @@ BDWTEST_F(BdwUsDeviceIdTest, isSimulationCap) { IBDW_GT4_DESK_DEVICE_F0_ID, 0, // default, non-simulation }; - OCLRT::MockDevice *mockDevice = nullptr; + NEO::MockDevice *mockDevice = nullptr; for (auto id : bdwSimulationIds) { mockDevice = createWithUsDeviceId(id); diff --git a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp b/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp index 549e993a6a..577cc809ea 100644 --- a/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp +++ b/unit_tests/gen8/bdw/test_hw_info_config_bdw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(BdwHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_BROADWELL != productFamily) { diff --git a/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp b/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp index 82372cf9d5..e5556dd2c5 100644 --- a/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp +++ b/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsBdw = HwInfoConfigTestWindows; diff --git a/unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp b/unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp index e9d1ef7b72..c0e7c815fe 100644 --- a/unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp +++ b/unit_tests/gen8/bdw/windows/test_device_caps_bdw_windows.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test BdwDeviceCaps; diff --git a/unit_tests/gen8/cmd_parse_gen8.cpp b/unit_tests/gen8/cmd_parse_gen8.cpp index bd6432af96..912551582a 100644 --- a/unit_tests/gen8/cmd_parse_gen8.cpp +++ b/unit_tests/gen8/cmd_parse_gen8.cpp @@ -8,8 +8,8 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -using GenStruct = OCLRT::GEN8; -using GenGfxFamily = OCLRT::BDWFamily; +using GenStruct = NEO::GEN8; +using GenGfxFamily = NEO::BDWFamily; #include "unit_tests/gen_common/cmd_parse_base.inl" #include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" #include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" @@ -64,8 +64,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; -namespace OCLRT { +namespace NEO { template void HardwareParse::findHardwareCommands(); template void HardwareParse::findHardwareCommands(IndirectHeap *); template const void *HardwareParse::getStatelessArgumentPointer(const Kernel &kernel, uint32_t indexArg, IndirectHeap &ioh); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen8/coherency_tests_gen8.cpp b/unit_tests/gen8/coherency_tests_gen8.cpp index 1c70df6679..d6dbfc7537 100644 --- a/unit_tests/gen8/coherency_tests_gen8.cpp +++ b/unit_tests/gen8/coherency_tests_gen8.cpp @@ -10,7 +10,7 @@ #include "runtime/platform/platform.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test Gen8CoherencyRequirements; diff --git a/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp b/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp index 825d3083c6..ba64237ebb 100644 --- a/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/unit_tests/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; #include "unit_tests/command_stream/command_stream_receiver_hw_tests.inl" diff --git a/unit_tests/gen8/enqueue_media_kernel_gen8.cpp b/unit_tests/gen8/enqueue_media_kernel_gen8.cpp index a48baf594e..e3a2895e5a 100644 --- a/unit_tests/gen8/enqueue_media_kernel_gen8.cpp +++ b/unit_tests/gen8/enqueue_media_kernel_gen8.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/media_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef MediaKernelFixture MediaKernelTest; diff --git a/unit_tests/gen8/image_tests_gen8.cpp b/unit_tests/gen8/image_tests_gen8.cpp index 03217f00ca..7bf867120c 100644 --- a/unit_tests/gen8/image_tests_gen8.cpp +++ b/unit_tests/gen8/image_tests_gen8.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test gen8ImageTests; diff --git a/unit_tests/gen8/kernel_tests_gen8.cpp b/unit_tests/gen8/kernel_tests_gen8.cpp index 4a69755c80..5072fb4228 100644 --- a/unit_tests/gen8/kernel_tests_gen8.cpp +++ b/unit_tests/gen8/kernel_tests_gen8.cpp @@ -10,7 +10,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; using Gen8KernelTest = Test; GEN8TEST_F(Gen8KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsFalse) { diff --git a/unit_tests/gen8/sampler_tests_gen8.cpp b/unit_tests/gen8/sampler_tests_gen8.cpp index a364e551a1..d16ef4fb1b 100644 --- a/unit_tests/gen8/sampler_tests_gen8.cpp +++ b/unit_tests/gen8/sampler_tests_gen8.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test Gen8SamplerTest; diff --git a/unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp b/unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp index 41ee3353ca..d2626b3f21 100644 --- a/unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp +++ b/unit_tests/gen8/scheduler_dispatch_tests_gen8.cpp @@ -18,7 +18,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef Test BdwSchedulerTest; diff --git a/unit_tests/gen8/scheduler_source_tests_gen8.cpp b/unit_tests/gen8/scheduler_source_tests_gen8.cpp index c5901825db..6217929a6b 100644 --- a/unit_tests/gen8/scheduler_source_tests_gen8.cpp +++ b/unit_tests/gen8/scheduler_source_tests_gen8.cpp @@ -16,7 +16,7 @@ // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them #include "unit_tests/scheduler/scheduler_source_tests.inl" -using namespace OCLRT; +using namespace NEO; typedef SchedulerSourceTest SchedulerSourceTestGen8; GEN8TEST_F(SchedulerSourceTestGen8, GivenDeviceQueueWhenCommandsSizeIsCalculatedThenItEqualsSpaceForEachEnqueueInSchedulerKernelCode) { diff --git a/unit_tests/gen8/test_device_caps_gen8.cpp b/unit_tests/gen8/test_device_caps_gen8.cpp index e677a707c4..a2cd29ecc1 100644 --- a/unit_tests/gen8/test_device_caps_gen8.cpp +++ b/unit_tests/gen8/test_device_caps_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test Gen8DeviceCaps; diff --git a/unit_tests/gen8/test_device_queue_hw_gen8.cpp b/unit_tests/gen8/test_device_queue_hw_gen8.cpp index 265140a742..ab8d63a48c 100644 --- a/unit_tests/gen8/test_device_queue_hw_gen8.cpp +++ b/unit_tests/gen8/test_device_queue_hw_gen8.cpp @@ -10,7 +10,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device_queue.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; typedef DeviceQueueHwTest Gen8DeviceQueueSlb; diff --git a/unit_tests/gen8/test_platform_caps_gen8.cpp b/unit_tests/gen8/test_platform_caps_gen8.cpp index b3ed055f24..f436aba88e 100644 --- a/unit_tests/gen8/test_platform_caps_gen8.cpp +++ b/unit_tests/gen8/test_platform_caps_gen8.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -using namespace OCLRT; +using namespace NEO; struct Gen8PlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { diff --git a/unit_tests/gen8/test_preamble_gen8.cpp b/unit_tests/gen8/test_preamble_gen8.cpp index 38aafcbd53..1303349563 100644 --- a/unit_tests/gen8/test_preamble_gen8.cpp +++ b/unit_tests/gen8/test_preamble_gen8.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/platform_fixture.h" #include "unit_tests/preamble/preamble_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef PreambleFixture BdwSlm; diff --git a/unit_tests/gen8/test_preemption_gen8.cpp b/unit_tests/gen8/test_preemption_gen8.cpp index 2315684ea0..55062aa267 100644 --- a/unit_tests/gen8/test_preemption_gen8.cpp +++ b/unit_tests/gen8/test_preemption_gen8.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -using namespace OCLRT; +using namespace NEO; using Gen8PreemptionTests = DevicePreemptionTests; using Gen8PreemptionEnqueueKernelTest = PreemptionEnqueueKernelTest; diff --git a/unit_tests/gen8/test_sample_gen8.cpp b/unit_tests/gen8/test_sample_gen8.cpp index 48a40265c8..4efb685ea6 100644 --- a/unit_tests/gen8/test_sample_gen8.cpp +++ b/unit_tests/gen8/test_sample_gen8.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test BroadwellOnlyTest; diff --git a/unit_tests/gen8/unit_test_helper_gen8.cpp b/unit_tests/gen8/unit_test_helper_gen8.cpp index 09008cdd93..3dc919703b 100644 --- a/unit_tests/gen8/unit_test_helper_gen8.cpp +++ b/unit_tests/gen8/unit_test_helper_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" -namespace OCLRT { +namespace NEO { template struct UnitTestHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp b/unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp index 3d62b13ae7..a508916312 100644 --- a/unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp +++ b/unit_tests/gen8/windows/gmm_callbacks_tests_gen8.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/helpers/gmm_callbacks.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test Gen8GmmCallbacksTests; diff --git a/unit_tests/gen9/bxt/device_tests_bxt.cpp b/unit_tests/gen9/bxt/device_tests_bxt.cpp index 2af009e21a..8d207fec6f 100644 --- a/unit_tests/gen9/bxt/device_tests_bxt.cpp +++ b/unit_tests/gen9/bxt/device_tests_bxt.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test DeviceTest; diff --git a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp b/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp index ebe2922c88..16ee8e6ad7 100644 --- a/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp +++ b/unit_tests/gen9/bxt/linux/dll/device_id_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(BxtDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp index 6f44c6053e..ffd1ffad30 100644 --- a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxBxt : HwInfoConfigTestLinux { diff --git a/unit_tests/gen9/bxt/test_device_caps_bxt.cpp b/unit_tests/gen9/bxt/test_device_caps_bxt.cpp index be48690bfb..3f99b1b944 100644 --- a/unit_tests/gen9/bxt/test_device_caps_bxt.cpp +++ b/unit_tests/gen9/bxt/test_device_caps_bxt.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test BxtDeviceCaps; @@ -55,7 +55,7 @@ BXTTEST_F(BxtUsDeviceIdTest, isSimulationCap) { IBXT_C_DEVICE_F0_ID, 0, // default, non-simulation }; - OCLRT::MockDevice *mockDevice = nullptr; + NEO::MockDevice *mockDevice = nullptr; for (auto id : bxtSimulationIds) { mockDevice = createWithUsDeviceId(id); diff --git a/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp b/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp index a960aa4123..0d1d0bad0d 100644 --- a/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp +++ b/unit_tests/gen9/bxt/test_hw_info_config_bxt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(BxtHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_BROXTON != productFamily) { diff --git a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp index 93ba480c09..c9e813c5a2 100644 --- a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp +++ b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsBxt = HwInfoConfigTestWindows; diff --git a/unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp b/unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp index 22835c7e57..3a2fc5330a 100644 --- a/unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp +++ b/unit_tests/gen9/bxt/windows/test_device_caps_bxt_windows.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test BxtDeviceCapsWindows; diff --git a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp index 62859a2b7c..ff1879eea8 100644 --- a/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp +++ b/unit_tests/gen9/cfl/linux/dll/device_id_tests_cfl.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(CflDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp index 8181066a66..481c6e5df9 100644 --- a/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp +++ b/unit_tests/gen9/cfl/linux/hw_info_config_tests_cfl.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxCfl : HwInfoConfigTestLinux { diff --git a/unit_tests/gen9/cfl/test_device_caps_cfl.cpp b/unit_tests/gen9/cfl/test_device_caps_cfl.cpp index 663dd08f4a..6fb6b1e005 100644 --- a/unit_tests/gen9/cfl/test_device_caps_cfl.cpp +++ b/unit_tests/gen9/cfl/test_device_caps_cfl.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test CflDeviceCaps; diff --git a/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp b/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp index dfdb1c135d..6a07e76236 100644 --- a/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/unit_tests/gen9/cfl/test_hw_info_config_cfl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(CflHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_COFFEELAKE != productFamily) { diff --git a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp index 64f5f88e53..e9a9824ba1 100644 --- a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp +++ b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsCfl = HwInfoConfigTestWindows; diff --git a/unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp b/unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp index e9058f6924..01bf780300 100644 --- a/unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp +++ b/unit_tests/gen9/cfl/windows/test_device_caps_cfl_windows.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test CflDeviceCapsWindows; diff --git a/unit_tests/gen9/cmd_parse_gen9.cpp b/unit_tests/gen9/cmd_parse_gen9.cpp index fe60b5e971..5f16d348b1 100644 --- a/unit_tests/gen9/cmd_parse_gen9.cpp +++ b/unit_tests/gen9/cmd_parse_gen9.cpp @@ -8,8 +8,8 @@ #include "unit_tests/gen_common/gen_cmd_parse.h" #include "gtest/gtest.h" -using GenStruct = OCLRT::GEN9; -using GenGfxFamily = OCLRT::SKLFamily; +using GenStruct = NEO::GEN9; +using GenGfxFamily = NEO::SKLFamily; #include "unit_tests/gen_common/cmd_parse_base.inl" #include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl" #include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl" @@ -82,8 +82,8 @@ const char *CmdParse::getCommandNameHwSpecific(void *cmd) { template struct CmdParse; -namespace OCLRT { +namespace NEO { template void HardwareParse::findHardwareCommands(); template void HardwareParse::findHardwareCommands(IndirectHeap *); template const void *HardwareParse::getStatelessArgumentPointer(const Kernel &kernel, uint32_t indexArg, IndirectHeap &ioh); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen9/coherency_tests_gen9.cpp b/unit_tests/gen9/coherency_tests_gen9.cpp index 7b6982afa9..c0a1c11c52 100644 --- a/unit_tests/gen9/coherency_tests_gen9.cpp +++ b/unit_tests/gen9/coherency_tests_gen9.cpp @@ -10,7 +10,7 @@ #include "runtime/platform/platform.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test Gen9CoherencyRequirements; diff --git a/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp b/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp index b3071f2abb..b9527cc219 100644 --- a/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/unit_tests/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -23,7 +23,7 @@ #include "gtest/gtest.h" #include "reg_configs_common.h" -using namespace OCLRT; +using namespace NEO; #include "unit_tests/command_stream/command_stream_receiver_hw_tests.inl" diff --git a/unit_tests/gen9/enqueue_kernel_gen9.cpp b/unit_tests/gen9/enqueue_kernel_gen9.cpp index b18ac9676b..f89ec6a6f0 100644 --- a/unit_tests/gen9/enqueue_kernel_gen9.cpp +++ b/unit_tests/gen9/enqueue_kernel_gen9.cpp @@ -14,7 +14,7 @@ #include "unit_tests/helpers/static_size3.h" #include "unit_tests/mocks/mock_kernel.h" -namespace OCLRT { +namespace NEO { using Gen9EnqueueTest = Test; GEN9TEST_F(Gen9EnqueueTest, givenKernelRequiringIndependentForwardProgressWhenKernelIsSubmittedThenRoundRobinPolicyIsProgrammed) { @@ -50,4 +50,4 @@ GEN9TEST_F(Gen9EnqueueTest, givenKernelNotRequiringIndependentForwardProgressWhe EXPECT_EQ(DebugControlReg2::getRegData(ThreadArbitrationPolicy::AgeBased), cmd->getDataDword()); EXPECT_EQ(1U, countMmio(hwParser.cmdList.begin(), hwParser.cmdList.end(), DebugControlReg2::address)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen9/enqueue_media_kernel_gen9.cpp b/unit_tests/gen9/enqueue_media_kernel_gen9.cpp index 225f7d40b5..29ac70f1c0 100644 --- a/unit_tests/gen9/enqueue_media_kernel_gen9.cpp +++ b/unit_tests/gen9/enqueue_media_kernel_gen9.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/media_kernel_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef MediaKernelFixture MediaKernelTest; GEN9TEST_F(MediaKernelTest, givenGen9CsrWhenEnqueueBlockedVmeKernelFirstTimeThenProgramPipelineSelectionAndMediaSampler) { diff --git a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp b/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp index 01ebd15451..0879c6a387 100644 --- a/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp +++ b/unit_tests/gen9/glk/linux/dll/device_id_tests_glk.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(GlkDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp index 3481e8a03d..72cdc400a3 100644 --- a/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp +++ b/unit_tests/gen9/glk/linux/hw_info_config_tests_glk.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxGlk : HwInfoConfigTestLinux { diff --git a/unit_tests/gen9/glk/test_device_caps_glk.cpp b/unit_tests/gen9/glk/test_device_caps_glk.cpp index 07be51bcf1..b6a4dda319 100644 --- a/unit_tests/gen9/glk/test_device_caps_glk.cpp +++ b/unit_tests/gen9/glk/test_device_caps_glk.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test Gen9DeviceCaps; @@ -47,7 +47,7 @@ GLKTEST_F(GlkUsDeviceIdTest, isSimulationCap) { IGLK_GT2_ULT_12EU_DEVICE_F0_ID, 0, // default, non-simulation }; - OCLRT::MockDevice *mockDevice = nullptr; + NEO::MockDevice *mockDevice = nullptr; for (auto id : glkSimulationIds) { mockDevice = createWithUsDeviceId(id); ASSERT_NE(mockDevice, nullptr); diff --git a/unit_tests/gen9/glk/test_hw_info_config_glk.cpp b/unit_tests/gen9/glk/test_hw_info_config_glk.cpp index 47b48a9c32..a006f3038d 100644 --- a/unit_tests/gen9/glk/test_hw_info_config_glk.cpp +++ b/unit_tests/gen9/glk/test_hw_info_config_glk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(GlkHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_GEMINILAKE != productFamily) { diff --git a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp index ddfd7909ac..b9c7538d32 100644 --- a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp +++ b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsGlk = HwInfoConfigTestWindows; diff --git a/unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp b/unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp index 6d0ebf468a..a06874bd3f 100644 --- a/unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp +++ b/unit_tests/gen9/glk/windows/test_device_caps_glk_windows.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test GlkDeviceCapsWindows; diff --git a/unit_tests/gen9/image_tests_gen9.cpp b/unit_tests/gen9/image_tests_gen9.cpp index 9907e91dfd..ea2b428574 100644 --- a/unit_tests/gen9/image_tests_gen9.cpp +++ b/unit_tests/gen9/image_tests_gen9.cpp @@ -9,7 +9,7 @@ #include "unit_tests/fixtures/image_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test gen9ImageTests; diff --git a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp b/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp index c049eed9b6..fa64126311 100644 --- a/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp +++ b/unit_tests/gen9/kbl/linux/dll/device_id_tests_kbl.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(KblDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp index 629952d12e..7022849b89 100644 --- a/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp +++ b/unit_tests/gen9/kbl/linux/hw_info_config_tests_kbl.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxKbl : HwInfoConfigTestLinux { diff --git a/unit_tests/gen9/kbl/test_device_caps_kbl.cpp b/unit_tests/gen9/kbl/test_device_caps_kbl.cpp index d9540d0c35..0ff550d55f 100644 --- a/unit_tests/gen9/kbl/test_device_caps_kbl.cpp +++ b/unit_tests/gen9/kbl/test_device_caps_kbl.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test KblDeviceCaps; diff --git a/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp b/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp index dafe6620c1..82cb7c3c95 100644 --- a/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/unit_tests/gen9/kbl/test_hw_info_config_kbl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(KblHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_KABYLAKE != productFamily) { diff --git a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp index 266a9dbe1c..09f2e1adb6 100644 --- a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp +++ b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsKbl = HwInfoConfigTestWindows; diff --git a/unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp b/unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp index 02a0865aab..02dfa3c118 100644 --- a/unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp +++ b/unit_tests/gen9/kbl/windows/test_device_caps_kbl_windows.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test KblDeviceCapsWindows; diff --git a/unit_tests/gen9/kernel_tests_gen9.cpp b/unit_tests/gen9/kernel_tests_gen9.cpp index e22a9d6c55..07af92ea73 100644 --- a/unit_tests/gen9/kernel_tests_gen9.cpp +++ b/unit_tests/gen9/kernel_tests_gen9.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; using Gen9KernelTest = Test; GEN9TEST_F(Gen9KernelTest, givenKernelWhenCanTransformImagesIsCalledThenReturnsTrue) { diff --git a/unit_tests/gen9/preamble_tests_gen9.cpp b/unit_tests/gen9/preamble_tests_gen9.cpp index 8840ea6e4d..1cfde5cd95 100644 --- a/unit_tests/gen9/preamble_tests_gen9.cpp +++ b/unit_tests/gen9/preamble_tests_gen9.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef SKLFamily GfxFamily; #include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" diff --git a/unit_tests/gen9/sampler_tests_gen9.cpp b/unit_tests/gen9/sampler_tests_gen9.cpp index 0320cd4659..11e93dbc4e 100644 --- a/unit_tests/gen9/sampler_tests_gen9.cpp +++ b/unit_tests/gen9/sampler_tests_gen9.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test Gen9SamplerTest; diff --git a/unit_tests/gen9/scheduler_source_tests_gen9.cpp b/unit_tests/gen9/scheduler_source_tests_gen9.cpp index 1cbce8de9b..627ef2cdb2 100644 --- a/unit_tests/gen9/scheduler_source_tests_gen9.cpp +++ b/unit_tests/gen9/scheduler_source_tests_gen9.cpp @@ -16,7 +16,7 @@ // Keep this include below scheduler_definitions.h and device_enqueue.h headers as it depends on defines defined in them #include "unit_tests/scheduler/scheduler_source_tests.inl" -using namespace OCLRT; +using namespace NEO; typedef SchedulerSourceTest SchedulerSourceTestGen9; GEN9TEST_F(SchedulerSourceTestGen9, GivenDeviceQueueWhenCommandsSizeIsCalculatedThenItEqualsSpaceForEachEnqueueInSchedulerKernelCode) { diff --git a/unit_tests/gen9/sip_tests_gen9.cpp b/unit_tests/gen9/sip_tests_gen9.cpp index 4cc309000e..31c465614f 100644 --- a/unit_tests/gen9/sip_tests_gen9.cpp +++ b/unit_tests/gen9/sip_tests_gen9.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace SipKernelTests { extern std::string getDebugSipKernelNameWithBitnessAndProductSuffix(std::string &base, const char *product); diff --git a/unit_tests/gen9/skl/device_tests_skl.cpp b/unit_tests/gen9/skl/device_tests_skl.cpp index 1ff3b32178..09d5730dfb 100644 --- a/unit_tests/gen9/skl/device_tests_skl.cpp +++ b/unit_tests/gen9/skl/device_tests_skl.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test DeviceTest; diff --git a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp b/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp index a7ff7e5379..7ed8e50e89 100644 --- a/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp +++ b/unit_tests/gen9/skl/linux/dll/device_id_tests_skl.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(SklDeviceIdTest, supportedDeviceId) { std::array expectedDescriptors = {{ diff --git a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp index 477d37e0dc..fe0a8bd721 100644 --- a/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp +++ b/unit_tests/gen9/skl/linux/hw_info_config_tests_skl.cpp @@ -8,7 +8,7 @@ #include "unit_tests/helpers/gtest_helpers.h" #include "unit_tests/os_interface/linux/hw_info_config_linux_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinuxSkl : HwInfoConfigTestLinux { diff --git a/unit_tests/gen9/skl/test_device_caps_skl.cpp b/unit_tests/gen9/skl/test_device_caps_skl.cpp index 4b40a3e654..eea511e483 100644 --- a/unit_tests/gen9/skl/test_device_caps_skl.cpp +++ b/unit_tests/gen9/skl/test_device_caps_skl.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test SklDeviceCaps; @@ -52,7 +52,7 @@ SKLTEST_F(SklUsDeviceIdTest, isSimulationCap) { ISKL_GT4_DESK_DEVICE_F0_ID, 0, // default, non-simulation }; - OCLRT::MockDevice *mockDevice = nullptr; + NEO::MockDevice *mockDevice = nullptr; for (auto id : sklSimulationIds) { mockDevice = createWithUsDeviceId(id); diff --git a/unit_tests/gen9/skl/test_hw_info_config_skl.cpp b/unit_tests/gen9/skl/test_hw_info_config_skl.cpp index 85fc77bd38..7a3ef7d386 100644 --- a/unit_tests/gen9/skl/test_hw_info_config_skl.cpp +++ b/unit_tests/gen9/skl/test_hw_info_config_skl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(SklHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorrect) { if (IGFX_SKYLAKE != productFamily) { diff --git a/unit_tests/gen9/skl/test_preamble_skl.cpp b/unit_tests/gen9/skl/test_preamble_skl.cpp index 82742fe751..92e432f378 100644 --- a/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -13,7 +13,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/preamble/preamble_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef PreambleFixture SklSlm; diff --git a/unit_tests/gen9/skl/test_sample_skl.cpp b/unit_tests/gen9/skl/test_sample_skl.cpp index fcf6314fa2..c0165abd4e 100644 --- a/unit_tests/gen9/skl/test_sample_skl.cpp +++ b/unit_tests/gen9/skl/test_sample_skl.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test SkylakeOnlyTest; diff --git a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp index 5ef061e516..9cc2d2108f 100644 --- a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp +++ b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" -using namespace OCLRT; +using namespace NEO; using namespace std; using HwInfoConfigTestWindowsSkl = HwInfoConfigTestWindows; diff --git a/unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp b/unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp index c1789e1689..97106a1ccf 100644 --- a/unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp +++ b/unit_tests/gen9/skl/windows/test_device_caps_skl_windows.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test SklDeviceCapsWindows; diff --git a/unit_tests/gen9/test_device_caps_gen9.cpp b/unit_tests/gen9/test_device_caps_gen9.cpp index 0a9d787168..d06b6878ba 100644 --- a/unit_tests/gen9/test_device_caps_gen9.cpp +++ b/unit_tests/gen9/test_device_caps_gen9.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test Gen9DeviceCaps; diff --git a/unit_tests/gen9/test_device_queue_hw_gen9.cpp b/unit_tests/gen9/test_device_queue_hw_gen9.cpp index 4b5b839cab..b56f9c6ede 100644 --- a/unit_tests/gen9/test_device_queue_hw_gen9.cpp +++ b/unit_tests/gen9/test_device_queue_hw_gen9.cpp @@ -11,7 +11,7 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device_queue.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; typedef DeviceQueueHwTest Gen9DeviceQueueSlb; diff --git a/unit_tests/gen9/test_platform_caps_gen9.cpp b/unit_tests/gen9/test_platform_caps_gen9.cpp index 27ebb2d65f..a71edb697d 100644 --- a/unit_tests/gen9/test_platform_caps_gen9.cpp +++ b/unit_tests/gen9/test_platform_caps_gen9.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" -using namespace OCLRT; +using namespace NEO; struct Gen9PlatformCaps : public PlatformFixture, public ::testing::Test { void SetUp() override { diff --git a/unit_tests/gen9/test_preemption_gen9.cpp b/unit_tests/gen9/test_preemption_gen9.cpp index a520c0a0f5..d1b5023711 100644 --- a/unit_tests/gen9/test_preemption_gen9.cpp +++ b/unit_tests/gen9/test_preemption_gen9.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -namespace OCLRT { +namespace NEO { template <> void HardwareParse::findCsrBaseAddress() { @@ -26,9 +26,9 @@ void HardwareParse::findCsrBaseAddress() { cmdGpgpuCsrBaseAddress = *itorGpgpuCsrBaseAddress; } } -} // namespace OCLRT +} // namespace NEO -using namespace OCLRT; +using namespace NEO; using Gen9PreemptionTests = DevicePreemptionTests; using Gen9PreemptionEnqueueKernelTest = PreemptionEnqueueKernelTest; diff --git a/unit_tests/gen9/test_sample_gen9.cpp b/unit_tests/gen9/test_sample_gen9.cpp index 3be129995d..f22731d9d4 100644 --- a/unit_tests/gen9/test_sample_gen9.cpp +++ b/unit_tests/gen9/test_sample_gen9.cpp @@ -8,7 +8,7 @@ #include "test.h" #include "unit_tests/fixtures/device_fixture.h" -using namespace OCLRT; +using namespace NEO; typedef Test Gen9OnlyTest; diff --git a/unit_tests/gen9/unit_test_helper_gen9.cpp b/unit_tests/gen9/unit_test_helper_gen9.cpp index e2476b2990..05ee7ace8a 100644 --- a/unit_tests/gen9/unit_test_helper_gen9.cpp +++ b/unit_tests/gen9/unit_test_helper_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/unit_test_helper.inl" -namespace OCLRT { +namespace NEO { template struct UnitTestHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp b/unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp index 01fedd337e..2c991d7a3c 100644 --- a/unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp +++ b/unit_tests/gen9/windows/gmm_callbacks_tests_gen9.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/helpers/gmm_callbacks.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test Gen9GmmCallbacksTests; diff --git a/unit_tests/gen_common/cmd_parse_base.inl b/unit_tests/gen_common/cmd_parse_base.inl index d23417b541..2085f40a2a 100644 --- a/unit_tests/gen_common/cmd_parse_base.inl +++ b/unit_tests/gen_common/cmd_parse_base.inl @@ -6,7 +6,7 @@ */ // clang-format off -using namespace OCLRT; +using namespace NEO; using MI_ARB_CHECK = GenStruct::MI_ARB_CHECK; using MI_ATOMIC = GenStruct::MI_ATOMIC; using MI_BATCH_BUFFER_END = GenStruct::MI_BATCH_BUFFER_END; diff --git a/unit_tests/gen_common/cmd_parse_gpgpu_walker.inl b/unit_tests/gen_common/cmd_parse_gpgpu_walker.inl index cbfb38a7f4..a3b388c856 100644 --- a/unit_tests/gen_common/cmd_parse_gpgpu_walker.inl +++ b/unit_tests/gen_common/cmd_parse_gpgpu_walker.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ // clang-format off -using namespace OCLRT; +using namespace NEO; using GPGPU_WALKER = GenStruct::GPGPU_WALKER; using MEDIA_INTERFACE_DESCRIPTOR_LOAD = GenStruct::MEDIA_INTERFACE_DESCRIPTOR_LOAD; using MEDIA_STATE_FLUSH = GenStruct::MEDIA_STATE_FLUSH; diff --git a/unit_tests/gen_common/cmd_parse_sip.inl b/unit_tests/gen_common/cmd_parse_sip.inl index 266c801f8b..fdfddede62 100644 --- a/unit_tests/gen_common/cmd_parse_sip.inl +++ b/unit_tests/gen_common/cmd_parse_sip.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ // clang-format off -using namespace OCLRT; +using namespace NEO; using GPGPU_CSR_BASE_ADDRESS = GenStruct::GPGPU_CSR_BASE_ADDRESS; using STATE_SIP = GenStruct::STATE_SIP; // clang-format on diff --git a/unit_tests/gen_common/gen_commands_common_validation.h b/unit_tests/gen_common/gen_commands_common_validation.h index bdb0e5753b..8dffe7ce3a 100644 --- a/unit_tests/gen_common/gen_commands_common_validation.h +++ b/unit_tests/gen_common/gen_commands_common_validation.h @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { template void validateStateBaseAddress(uint64_t internalHeapBase, IndirectHeap *pDSH, IndirectHeap *pIOH, @@ -106,4 +106,4 @@ void validateMediaVFEState(const HardwareInfo *hwInfo, void *cmdMediaVfeState, G // Generically validate this command FamilyType::PARSE::template validateCommand(cmdList.begin(), itorMediaVfeState); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gen_common/test.h b/unit_tests/gen_common/test.h index ca0597b1c7..004d3ea118 100644 --- a/unit_tests/gen_common/test.h +++ b/unit_tests/gen_common/test.h @@ -20,22 +20,22 @@ extern PRODUCT_FAMILY productFamily; extern GFXCORE_FAMILY renderCoreFamily; #ifdef TESTS_GEN8 -#define BDW_TYPED_TEST_BODY testBodyHw::GfxFamily>(); -#define BDW_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); +#define BDW_TYPED_TEST_BODY testBodyHw::GfxFamily>(); +#define BDW_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); #else #define BDW_TYPED_TEST_BODY #define BDW_TYPED_CMDTEST_BODY #endif #ifdef TESTS_GEN9 -#define SKL_TYPED_TEST_BODY testBodyHw::GfxFamily>(); -#define SKL_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); +#define SKL_TYPED_TEST_BODY testBodyHw::GfxFamily>(); +#define SKL_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); #else #define SKL_TYPED_TEST_BODY #define SKL_TYPED_CMDTEST_BODY #endif #ifdef TESTS_GEN10 -#define CNL_TYPED_TEST_BODY testBodyHw::GfxFamily>(); -#define CNL_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); +#define CNL_TYPED_TEST_BODY testBodyHw::GfxFamily>(); +#define CNL_TYPED_CMDTEST_BODY runCmdTestHwIfSupported::GfxFamily>(); #else #define CNL_TYPED_TEST_BODY #define CNL_TYPED_CMDTEST_BODY @@ -264,7 +264,7 @@ extern GFXCORE_FAMILY renderCoreFamily; \ void TestBody() override { \ CALL_IF_MATCH(match_core, match_product, \ - testBodyHw::GfxFamily>()) \ + testBodyHw::GfxFamily>()) \ } \ void SetUp() override { \ CALL_IF_MATCH(match_core, match_product, parent_class::SetUp()) \ @@ -402,7 +402,7 @@ extern GFXCORE_FAMILY renderCoreFamily; \ void TestBody() override { \ CALL_IF_MATCH(match_core, match_product, \ - testBodyHw::GfxFamily>()) \ + testBodyHw::GfxFamily>()) \ } \ void SetUp() override { \ CALL_IF_MATCH(match_core, match_product, test_case_name::SetUp()) \ diff --git a/unit_tests/global_environment.cpp b/unit_tests/global_environment.cpp index efefee4f49..7ae3e3679e 100644 --- a/unit_tests/global_environment.cpp +++ b/unit_tests/global_environment.cpp @@ -40,23 +40,23 @@ void TestEnvironment::TearDown() { void TestEnvironment::fclPushDebugVars( MockCompilerDebugVars &newDebugVars) { fclDebugVarStack.push_back(newDebugVars); - OCLRT::setFclDebugVars(newDebugVars); + NEO::setFclDebugVars(newDebugVars); } void TestEnvironment::fclPopDebugVars() { fclDebugVarStack.pop_back(); - OCLRT::setFclDebugVars(fclDebugVarStack.back()); + NEO::setFclDebugVars(fclDebugVarStack.back()); } void TestEnvironment::igcPushDebugVars( MockCompilerDebugVars &newDebugVars) { igcDebugVarStack.push_back(newDebugVars); - OCLRT::setIgcDebugVars(newDebugVars); + NEO::setIgcDebugVars(newDebugVars); } void TestEnvironment::igcPopDebugVars() { igcDebugVarStack.pop_back(); - OCLRT::setIgcDebugVars(igcDebugVarStack.back()); + NEO::setIgcDebugVars(igcDebugVarStack.back()); } void TestEnvironment::setDefaultDebugVars( diff --git a/unit_tests/global_environment.h b/unit_tests/global_environment.h index b135274a3b..2eb072c499 100644 --- a/unit_tests/global_environment.h +++ b/unit_tests/global_environment.h @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace); diff --git a/unit_tests/gmm_helper/gmm_helper_tests.cpp b/unit_tests/gmm_helper/gmm_helper_tests.cpp index 3c960148fd..34f0f967dd 100644 --- a/unit_tests/gmm_helper/gmm_helper_tests.cpp +++ b/unit_tests/gmm_helper/gmm_helper_tests.cpp @@ -28,7 +28,7 @@ using namespace ::testing; -namespace OCLRT { +namespace NEO { struct GmmTests : public ::testing::Test { void SetUp() override { executionEnvironment = platformImpl->peekExecutionEnvironment(); @@ -46,11 +46,11 @@ TEST(GmmGlTests, givenGmmWhenAskedforCubeFaceIndexThenProperValueIsReturned) { uint32_t maxVal = 0; for (auto p : v) { - EXPECT_TRUE(p.first == OCLRT::GmmHelper::getCubeFaceIndex(p.second)); + EXPECT_TRUE(p.first == NEO::GmmHelper::getCubeFaceIndex(p.second)); maxVal = std::max(maxVal, p.second); } maxVal++; - EXPECT_TRUE(__GMM_NO_CUBE_MAP == OCLRT::GmmHelper::getCubeFaceIndex(maxVal)); + EXPECT_TRUE(__GMM_NO_CUBE_MAP == NEO::GmmHelper::getCubeFaceIndex(maxVal)); } TEST_F(GmmTests, resourceCreation) { @@ -730,4 +730,4 @@ TEST_F(GmmQueryInfoWithoutYTilingTest, givenPlatformThatDoesntSupportYTilingWhen EXPECT_EQ(queryGmm->resourceParams.Flags.Info.Linear, 1u); EXPECT_EQ(queryGmm->resourceParams.Flags.Info.TiledY, 0u); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/gmm_helper/gmm_interface_tests.cpp b/unit_tests/gmm_helper/gmm_interface_tests.cpp index 8ca1077cd4..29df22c7cb 100644 --- a/unit_tests/gmm_helper/gmm_interface_tests.cpp +++ b/unit_tests/gmm_helper/gmm_interface_tests.cpp @@ -69,10 +69,10 @@ namespace Os { extern const char *gmmDllName; extern const char *gmmEntryName; } // namespace Os -namespace OCLRT { +namespace NEO { extern const HardwareInfo **platformDevices; } -using namespace OCLRT; +using namespace NEO; struct GmmInterfaceTest : public ::testing::Test { void SetUp() override { diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/unit_tests/gtpin/gtpin_tests.cpp index 6b89670ae8..fdc26b1dd1 100644 --- a/unit_tests/gtpin/gtpin_tests.cpp +++ b/unit_tests/gtpin/gtpin_tests.cpp @@ -38,10 +38,10 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace gtpin; -namespace OCLRT { +namespace NEO { extern std::deque kernelExecQueue; } @@ -162,7 +162,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { gtpinCallbacks.onCommandBufferCreate = nullptr; gtpinCallbacks.onCommandBufferComplete = nullptr; - OCLRT::isGTPinInitialized = false; + NEO::isGTPinInitialized = false; kernelOffset = 0; } @@ -170,7 +170,7 @@ class GTPinFixture : public ContextFixture, public MemoryManagementFixture { ContextFixture::TearDown(); platformImpl.reset(nullptr); MemoryManagementFixture::TearDown(); - OCLRT::isGTPinInitialized = false; + NEO::isGTPinInitialized = false; } Platform *pPlatform = nullptr; @@ -264,10 +264,10 @@ TEST_F(GTPinTests, givenValidAndCompleteArgumentsThenGTPinInitSucceeds) { gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - EXPECT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - EXPECT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + EXPECT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + EXPECT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); isInitialized = gtpinIsGTPinInitialized(); EXPECT_TRUE(isInitialized); } @@ -281,10 +281,10 @@ TEST_F(GTPinTests, givenValidAndCompleteArgumentsWhenGTPinIsAlreadyInitializedTh gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - EXPECT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - EXPECT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + EXPECT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + EXPECT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_ERROR_INSTANCE_ALREADY_CREATED, retFromGtPin); @@ -302,10 +302,10 @@ TEST_F(GTPinTests, givenInvalidArgumentsThenBufferAllocateFails) { gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - EXPECT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + EXPECT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); retFromGtPin = (*driverServices.bufferAllocate)(nullptr, buffSize, &res); EXPECT_NE(GTPIN_DI_SUCCESS, retFromGtPin); @@ -324,10 +324,10 @@ TEST_F(GTPinTests, givenInvalidArgumentsThenBufferDeallocateFails) { gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - EXPECT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + EXPECT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); retFromGtPin = (*driverServices.bufferDeallocate)(nullptr, nullptr); EXPECT_NE(GTPIN_DI_SUCCESS, retFromGtPin); @@ -349,10 +349,10 @@ TEST_F(GTPinTests, givenInvalidArgumentsThenBufferMapFails) { gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - EXPECT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - EXPECT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - ASSERT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + EXPECT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + EXPECT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + ASSERT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); uint8_t *mappedPtr; retFromGtPin = (*driverServices.bufferMap)(nullptr, nullptr, &mappedPtr); @@ -375,10 +375,10 @@ TEST_F(GTPinTests, givenInvalidArgumentsThenBufferUnMapFails) { gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - EXPECT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - EXPECT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - ASSERT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + EXPECT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + EXPECT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + ASSERT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); retFromGtPin = (*driverServices.bufferUnMap)(nullptr, nullptr); EXPECT_NE(GTPIN_DI_SUCCESS, retFromGtPin); @@ -416,10 +416,10 @@ TEST_F(GTPinTests, givenValidRequestForHugeMemoryAllocationThenBufferAllocateFai gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); injectFailures(allocBufferFunc); } @@ -436,10 +436,10 @@ TEST_F(GTPinTests, givenValidRequestForMemoryAllocationThenBufferAllocateAndDeal gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); cl_context ctxt = (cl_context)((Context *)pContext); retFromGtPin = (*driverServices.bufferAllocate)((gtpin::context_handle_t)ctxt, buffSize, &res); @@ -462,10 +462,10 @@ TEST_F(GTPinTests, givenValidArgumentsForBufferMapWhenCallSequenceIsCorrectThenB gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - ASSERT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + ASSERT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); cl_context ctxt = (cl_context)((Context *)pContext); retFromGtPin = (*driverServices.bufferAllocate)((gtpin::context_handle_t)ctxt, buffSize, &res); @@ -493,10 +493,10 @@ TEST_F(GTPinTests, givenMissingReturnArgumentForBufferMapWhenCallSequenceIsCorre gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - ASSERT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + ASSERT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); cl_context ctxt = (cl_context)((Context *)pContext); retFromGtPin = (*driverServices.bufferAllocate)((gtpin::context_handle_t)ctxt, buffSize, &res); @@ -522,10 +522,10 @@ TEST_F(GTPinTests, givenValidArgumentsForBufferUnMapWhenCallSequenceIsCorrectThe gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - ASSERT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - ASSERT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + ASSERT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + ASSERT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); cl_context ctxt = (cl_context)((Context *)pContext); retFromGtPin = (*driverServices.bufferAllocate)((gtpin::context_handle_t)ctxt, buffSize, &res); @@ -2023,10 +2023,10 @@ TEST_F(GTPinTests, givenInitializedGTPinInterfaceWhenLowMemoryConditionOccursThe gtpinCallbacks.onCommandBufferComplete = OnCommandBufferComplete; retFromGtPin = GTPin_Init(>pinCallbacks, &driverServices, nullptr); EXPECT_EQ(GTPIN_DI_SUCCESS, retFromGtPin); - ASSERT_EQ(&OCLRT::gtpinCreateBuffer, driverServices.bufferAllocate); - ASSERT_EQ(&OCLRT::gtpinFreeBuffer, driverServices.bufferDeallocate); - EXPECT_EQ(&OCLRT::gtpinMapBuffer, driverServices.bufferMap); - EXPECT_EQ(&OCLRT::gtpinUnmapBuffer, driverServices.bufferUnMap); + ASSERT_EQ(&NEO::gtpinCreateBuffer, driverServices.bufferAllocate); + ASSERT_EQ(&NEO::gtpinFreeBuffer, driverServices.bufferDeallocate); + EXPECT_EQ(&NEO::gtpinMapBuffer, driverServices.bufferMap); + EXPECT_EQ(&NEO::gtpinUnmapBuffer, driverServices.bufferUnMap); injectFailures(allocBufferFunc); } diff --git a/unit_tests/helpers/array_count_tests.cpp b/unit_tests/helpers/array_count_tests.cpp index 6d0eb9a11e..6e4604ddb6 100644 --- a/unit_tests/helpers/array_count_tests.cpp +++ b/unit_tests/helpers/array_count_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { TEST(ArrayCountTests, arrayCount) { int a[10]; @@ -22,4 +22,4 @@ TEST(ArrayCountTests, isInRange) { EXPECT_FALSE(isInRange(10, a)); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/helpers/base_object_tests.cpp b/unit_tests/helpers/base_object_tests.cpp index 7d061ea3f5..37787fc051 100644 --- a/unit_tests/helpers/base_object_tests.cpp +++ b/unit_tests/helpers/base_object_tests.cpp @@ -24,7 +24,7 @@ #include "gmock/gmock.h" -namespace OCLRT { +namespace NEO { typedef struct _cl_object_for_test2 *cl_object_for_test2; struct _cl_object_for_test2 : public ClDispatch { @@ -40,7 +40,7 @@ struct OpenCLObjectMapper { typedef _cl_object_for_test2 BaseType; }; -struct ObjectForTest2 : public OCLRT::BaseObject<_cl_object_for_test2> { +struct ObjectForTest2 : public NEO::BaseObject<_cl_object_for_test2> { static const cl_ulong objectMagic = 0x13650a12b79ce4dfLL; }; @@ -325,13 +325,13 @@ TYPED_TEST(BaseObjectTests, getCond) { } TYPED_TEST(BaseObjectTests, convertToInternalObject) { - class ObjectForTest : public OCLRT::MemObj { + class ObjectForTest : public NEO::MemObj { public: ObjectForTest() : MemObj(nullptr, 0, 0, 0u, nullptr, nullptr, nullptr, false, false, false) { } void convertToInternalObject(void) { - OCLRT::BaseObject<_cl_mem>::convertToInternalObject(); + NEO::BaseObject<_cl_mem>::convertToInternalObject(); } }; ObjectForTest *object = new ObjectForTest; @@ -362,4 +362,4 @@ TYPED_TEST(BaseObjectTests, castToOrAbortDifferentTypeAborts) { auto notOriginalType = reinterpret_cast(baseObject); EXPECT_ANY_THROW(castToObjectOrAbort(notOriginalType)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/base_object_tests_mt.cpp b/unit_tests/helpers/base_object_tests_mt.cpp index 1c47964e7f..f00d80ff09 100644 --- a/unit_tests/helpers/base_object_tests_mt.cpp +++ b/unit_tests/helpers/base_object_tests_mt.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { template struct BaseObjectTestsMt : public ::testing::Test { @@ -64,4 +64,4 @@ TYPED_TEST(BaseObjectTestsMt, takeOwner) { object->release(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/bit_helpers_tests.cpp b/unit_tests/helpers/bit_helpers_tests.cpp index a2a7e13030..2e88d9b332 100644 --- a/unit_tests/helpers/bit_helpers_tests.cpp +++ b/unit_tests/helpers/bit_helpers_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(IsBitSetTests, givenDifferentValuesWhenTestingIsBitSetThenCorrectValueIsReturned) { size_t field1 = 0; diff --git a/unit_tests/helpers/built_ins_helper.cpp b/unit_tests/helpers/built_ins_helper.cpp index 99e46b796b..b20a102cf6 100644 --- a/unit_tests/helpers/built_ins_helper.cpp +++ b/unit_tests/helpers/built_ins_helper.cpp @@ -11,7 +11,7 @@ #include "unit_tests/mocks/mock_compilers.h" #include "unit_tests/mocks/mock_program.h" -namespace OCLRT { +namespace NEO { const SipKernel &initSipKernel(SipKernelType type, Device &device) { auto mockCompilerInterface = new MockCompilerInterface(); @@ -30,4 +30,4 @@ Program *createProgramForSip(ExecutionEnvironment &executionEnvironment, GlobalMockSipProgram::sipProgram->resetAllocationState(); return GlobalMockSipProgram::sipProgram; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/cl_helper_tests.cpp b/unit_tests/helpers/cl_helper_tests.cpp index 95fe49a587..6671e84fbb 100644 --- a/unit_tests/helpers/cl_helper_tests.cpp +++ b/unit_tests/helpers/cl_helper_tests.cpp @@ -44,13 +44,13 @@ TEST(ClHelper, whenCallGetStringWithCmdTypeFunctionThenGetProperCmdTypeAsString) "CL_COMMAND_SVM_UNMAP"}}; for (int i = CL_COMMAND_NDRANGE_KERNEL; i <= CL_COMMAND_SVM_UNMAP; i++) { - EXPECT_STREQ(expected[i - CL_COMMAND_NDRANGE_KERNEL].c_str(), OCLRT::cmdTypetoString(i).c_str()); + EXPECT_STREQ(expected[i - CL_COMMAND_NDRANGE_KERNEL].c_str(), NEO::cmdTypetoString(i).c_str()); } std::stringstream stream; stream << "CMD_UNKNOWN:" << (cl_command_type)-1; - EXPECT_STREQ(stream.str().c_str(), OCLRT::cmdTypetoString(-1).c_str()); + EXPECT_STREQ(stream.str().c_str(), NEO::cmdTypetoString(-1).c_str()); - EXPECT_STREQ("CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR", OCLRT::cmdTypetoString(CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR).c_str()); + EXPECT_STREQ("CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR", NEO::cmdTypetoString(CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR).c_str()); } \ No newline at end of file diff --git a/unit_tests/helpers/cmd_buffer_validator.h b/unit_tests/helpers/cmd_buffer_validator.h index 14bb0da0a2..b30745d421 100644 --- a/unit_tests/helpers/cmd_buffer_validator.h +++ b/unit_tests/helpers/cmd_buffer_validator.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct CmdValidator { CmdValidator() { @@ -338,11 +338,11 @@ inline bool expectCmdBuff(GenCmdList::iterator begin, GenCmdList::iterator end, } template -inline bool expectCmdBuff(OCLRT::LinearStream &commandStream, size_t startOffset, +inline bool expectCmdBuff(NEO::LinearStream &commandStream, size_t startOffset, std::vector &&expectedCmdBuffMatchers, std::string *outReason = nullptr) { HardwareParse hwParser; hwParser.parseCommands(commandStream, startOffset); return expectCmdBuff(hwParser.cmdList.begin(), hwParser.cmdList.end(), std::move(expectedCmdBuffMatchers), outReason); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/cmd_buffer_validator_tests.cpp b/unit_tests/helpers/cmd_buffer_validator_tests.cpp index 1cc7bac9dd..428b3cd027 100644 --- a/unit_tests/helpers/cmd_buffer_validator_tests.cpp +++ b/unit_tests/helpers/cmd_buffer_validator_tests.cpp @@ -12,7 +12,7 @@ using HwParseTest = ::testing::Test; -using namespace OCLRT; +using namespace NEO; HWTEST_F(HwParseTest, WhenEmptyBufferThenDontExpectCommands) { using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; diff --git a/unit_tests/helpers/debug_helpers.cpp b/unit_tests/helpers/debug_helpers.cpp index da55d6fd53..f611dd191e 100644 --- a/unit_tests/helpers/debug_helpers.cpp +++ b/unit_tests/helpers/debug_helpers.cpp @@ -9,10 +9,10 @@ #include -namespace OCLRT { +namespace NEO { void debugBreak(int line, const char *file) { } void abortUnrecoverable(int line, const char *file) { throw std::exception(); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/helpers/debug_helpers_tests.cpp b/unit_tests/helpers/debug_helpers_tests.cpp index 74b2b4d30e..26438a9787 100644 --- a/unit_tests/helpers/debug_helpers_tests.cpp +++ b/unit_tests/helpers/debug_helpers_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(debugBreak, whenDebugBreakCalledInTestThenNothingIsThrown) { DEBUG_BREAK_IF(!false); diff --git a/unit_tests/helpers/debug_manager_state_restore.h b/unit_tests/helpers/debug_manager_state_restore.h index b4c7625467..e46314eb19 100644 --- a/unit_tests/helpers/debug_manager_state_restore.h +++ b/unit_tests/helpers/debug_manager_state_restore.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/utilities/debug_settings_reader.h" -using namespace OCLRT; +using namespace NEO; class DebugManagerStateRestore { public: diff --git a/unit_tests/helpers/dirty_state_helpers_tests.cpp b/unit_tests/helpers/dirty_state_helpers_tests.cpp index d10cbfe6d8..b7c3a2dd37 100644 --- a/unit_tests/helpers/dirty_state_helpers_tests.cpp +++ b/unit_tests/helpers/dirty_state_helpers_tests.cpp @@ -16,7 +16,7 @@ #include namespace DirtyStateHelpers { -using namespace OCLRT; +using namespace NEO; size_t getSizeInPages(size_t sizeInBytes) { return (sizeInBytes + MemoryConstants::pageSize) / MemoryConstants::pageSize; } diff --git a/unit_tests/helpers/dispatch_info_builder_tests.cpp b/unit_tests/helpers/dispatch_info_builder_tests.cpp index 96334382b8..26fa323bba 100644 --- a/unit_tests/helpers/dispatch_info_builder_tests.cpp +++ b/unit_tests/helpers/dispatch_info_builder_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_kernel.h" -namespace OCLRT { +namespace NEO { using namespace SplitDispatch; @@ -1006,4 +1006,4 @@ TEST_F(DispatchInfoBuilderTest, setKernelArgNullKernel) { delete diBuilder; delete buffer; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/dispatch_info_tests.cpp b/unit_tests/helpers/dispatch_info_tests.cpp index 00a63944e9..ab0defe9ce 100644 --- a/unit_tests/helpers/dispatch_info_tests.cpp +++ b/unit_tests/helpers/dispatch_info_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; class DispatchInfoFixture : public ContextFixture, public DeviceFixture { using ContextFixture::SetUp; diff --git a/unit_tests/helpers/execution_environment_helper.cpp b/unit_tests/helpers/execution_environment_helper.cpp index dcc5aeb07e..6f29f44a0e 100644 --- a/unit_tests/helpers/execution_environment_helper.cpp +++ b/unit_tests/helpers/execution_environment_helper.cpp @@ -10,7 +10,7 @@ #include "runtime/os_interface/device_factory.h" #include "runtime/platform/platform.h" -namespace OCLRT { +namespace NEO { ExecutionEnvironment *getExecutionEnvironmentImpl(HardwareInfo *&hwInfo) { ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment(); @@ -21,4 +21,4 @@ ExecutionEnvironment *getExecutionEnvironmentImpl(HardwareInfo *&hwInfo) { return executionEnvironment; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/execution_environment_helper.h b/unit_tests/helpers/execution_environment_helper.h index c2d21c3dd2..58ac7d97a6 100644 --- a/unit_tests/helpers/execution_environment_helper.h +++ b/unit_tests/helpers/execution_environment_helper.h @@ -12,6 +12,6 @@ #include -namespace OCLRT { +namespace NEO { ExecutionEnvironment *getExecutionEnvironmentImpl(HardwareInfo *&hwInfo); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/flush_stamp_tests.cpp b/unit_tests/helpers/flush_stamp_tests.cpp index ef931ecb73..ba6049f78d 100644 --- a/unit_tests/helpers/flush_stamp_tests.cpp +++ b/unit_tests/helpers/flush_stamp_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(FlushStampTest, referenceTrackedFlushStamp) { FlushStampTracker *flushStampTracker = new FlushStampTracker(true); diff --git a/unit_tests/helpers/get_gpgpu_engines_tests.inl b/unit_tests/helpers/get_gpgpu_engines_tests.inl index 0ef94a6ea7..90a074f7bd 100644 --- a/unit_tests/helpers/get_gpgpu_engines_tests.inl +++ b/unit_tests/helpers/get_gpgpu_engines_tests.inl @@ -8,7 +8,7 @@ #include "runtime/helpers/hw_helper.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; template void whenGetGpgpuEnginesThenReturnTwoRcsEngines() { diff --git a/unit_tests/helpers/hash_tests.cpp b/unit_tests/helpers/hash_tests.cpp index 3d8fabf2f0..173f7683db 100644 --- a/unit_tests/helpers/hash_tests.cpp +++ b/unit_tests/helpers/hash_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(HashTests, givenSamePointersWhenHashIsCalculatedThenSame32BitValuesAreGenerated) { uintptr_t ptr1UI = 1; diff --git a/unit_tests/helpers/hw_helper_tests.h b/unit_tests/helpers/hw_helper_tests.h index 0861da39e1..00c3e7bd33 100644 --- a/unit_tests/helpers/hw_helper_tests.h +++ b/unit_tests/helpers/hw_helper_tests.h @@ -13,7 +13,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/helpers/hw_info_helper.h" -using namespace OCLRT; +using namespace NEO; class HwHelperFixture : public DeviceFixture { protected: diff --git a/unit_tests/helpers/hw_info_helper.h b/unit_tests/helpers/hw_info_helper.h index f48c8a5fe8..06c275f507 100644 --- a/unit_tests/helpers/hw_info_helper.h +++ b/unit_tests/helpers/hw_info_helper.h @@ -9,7 +9,7 @@ #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" -using namespace OCLRT; +using namespace NEO; struct HwInfoHelper { HwInfoHelper() { diff --git a/unit_tests/helpers/hw_parse.h b/unit_tests/helpers/hw_parse.h index f5f75a1b6f..dc3946a1d6 100644 --- a/unit_tests/helpers/hw_parse.h +++ b/unit_tests/helpers/hw_parse.h @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct HardwareParse { HardwareParse() : previousCS(nullptr), @@ -68,7 +68,7 @@ struct HardwareParse { void findHardwareCommands(IndirectHeap *dsh); template - void parseCommands(OCLRT::LinearStream &commandStream, size_t startOffset = 0) { + void parseCommands(NEO::LinearStream &commandStream, size_t startOffset = 0) { ASSERT_LE(startOffset, commandStream.getUsed()); auto sizeToParse = commandStream.getUsed() - startOffset; ASSERT_TRUE(FamilyType::PARSE::parseCommandBuffer( @@ -78,7 +78,7 @@ struct HardwareParse { } template - void parseCommands(OCLRT::CommandQueue &commandQueue) { + void parseCommands(NEO::CommandQueue &commandQueue) { auto &commandStreamReceiver = commandQueue.getCommandStreamReceiver(); auto &commandStreamCSR = commandStreamReceiver.getCS(); @@ -217,4 +217,4 @@ struct HardwareParse { void *cmdGpgpuCsrBaseAddress; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/hw_parse.inl b/unit_tests/helpers/hw_parse.inl index d709568b04..f5cc6bfb22 100644 --- a/unit_tests/helpers/hw_parse.inl +++ b/unit_tests/helpers/hw_parse.inl @@ -7,7 +7,7 @@ #include "unit_tests/helpers/hw_parse.h" -namespace OCLRT { +namespace NEO { template void HardwareParse::findHardwareCommands(IndirectHeap *dsh) { @@ -115,4 +115,4 @@ const void *HardwareParse::getStatelessArgumentPointer(const Kernel &kernel, uin return nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/kernel_commands_tests.cpp b/unit_tests/helpers/kernel_commands_tests.cpp index 0a0e2bbcc8..f1eb9f2945 100644 --- a/unit_tests/helpers/kernel_commands_tests.cpp +++ b/unit_tests/helpers/kernel_commands_tests.cpp @@ -21,7 +21,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; void KernelCommandsTest::SetUp() { DeviceFixture::SetUp(); diff --git a/unit_tests/helpers/kernel_commands_tests.h b/unit_tests/helpers/kernel_commands_tests.h index 23a04958b4..6a4a8d28d1 100644 --- a/unit_tests/helpers/kernel_commands_tests.h +++ b/unit_tests/helpers/kernel_commands_tests.h @@ -18,7 +18,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct KernelCommandsTest : DeviceFixture, ContextFixture, diff --git a/unit_tests/helpers/kmd_notify_tests.cpp b/unit_tests/helpers/kmd_notify_tests.cpp index affd0e43ff..7df71cfc8b 100644 --- a/unit_tests/helpers/kmd_notify_tests.cpp +++ b/unit_tests/helpers/kmd_notify_tests.cpp @@ -20,7 +20,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -using namespace OCLRT; +using namespace NEO; struct KmdNotifyTests : public ::testing::Test { void SetUp() override { diff --git a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp b/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp index 99edaf67f0..6d84ed8ac9 100644 --- a/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp +++ b/unit_tests/helpers/linux/kmd_notify_linux_tests.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/options.h" #include "test.h" -namespace OCLRT { +namespace NEO { class MockKmdNotifyHelper : public KmdNotifyHelper { public: @@ -26,4 +26,4 @@ TEST(KmdNotifyLinuxTests, givenTaskCountDiffGreaterThanOneWhenBaseTimeoutRequest MockKmdNotifyHelper helper(&localProperties); EXPECT_EQ(localProperties.delayKmdNotifyMicroseconds * multiplier, helper.getBaseTimeout(multiplier)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/mipmap_tests.cpp b/unit_tests/helpers/mipmap_tests.cpp index a3f216f6cb..fb540c7648 100644 --- a/unit_tests/helpers/mipmap_tests.cpp +++ b/unit_tests/helpers/mipmap_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; constexpr size_t testOrigin[]{2, 3, 5, 7}; @@ -56,20 +56,20 @@ INSTANTIATE_TEST_CASE_P(MipLevelOriginIdx, TEST(MipmapHelper, givenClImageDescWithoutMipLevelsWhenIsMipMappedIsCalledThenFalseIsReturned) { cl_image_desc desc = {}; desc.num_mip_levels = 0; - EXPECT_FALSE(OCLRT::isMipMapped(desc)); + EXPECT_FALSE(NEO::isMipMapped(desc)); desc.num_mip_levels = 1; - EXPECT_FALSE(OCLRT::isMipMapped(desc)); + EXPECT_FALSE(NEO::isMipMapped(desc)); } TEST(MipmapHelper, givenClImageDescWithMipLevelsWhenIsMipMappedIsCalledThenTrueIsReturned) { cl_image_desc desc = {}; desc.num_mip_levels = 2; - EXPECT_TRUE(OCLRT::isMipMapped(desc)); + EXPECT_TRUE(NEO::isMipMapped(desc)); } TEST(MipmapHelper, givenBufferWhenIsMipMappedIsCalledThenFalseIsReturned) { MockBuffer buffer; - EXPECT_FALSE(OCLRT::isMipMapped(&buffer)); + EXPECT_FALSE(NEO::isMipMapped(&buffer)); } struct MockImage : MockImageBase { @@ -82,15 +82,15 @@ struct MockImage : MockImageBase { TEST(MipmapHelper, givenImageWithoutMipLevelsWhenIsMipMappedIsCalledThenFalseIsReturned) { MockImage image; image.imageDesc.num_mip_levels = 0; - EXPECT_FALSE(OCLRT::isMipMapped(&image)); + EXPECT_FALSE(NEO::isMipMapped(&image)); image.imageDesc.num_mip_levels = 1; - EXPECT_FALSE(OCLRT::isMipMapped(&image)); + EXPECT_FALSE(NEO::isMipMapped(&image)); } TEST(MipmapHelper, givenImageWithMipLevelsWhenIsMipMappedIsCalledThenTrueIsReturned) { MockImage image; image.imageDesc.num_mip_levels = 2; - EXPECT_TRUE(OCLRT::isMipMapped(&image)); + EXPECT_TRUE(NEO::isMipMapped(&image)); } TEST(MipmapHelper, givenImageWithoutMipLevelsWhenGetMipOffsetIsCalledThenZeroIsReturned) { diff --git a/unit_tests/helpers/per_thread_data_tests.cpp b/unit_tests/helpers/per_thread_data_tests.cpp index b6881db138..a905b2579a 100644 --- a/unit_tests/helpers/per_thread_data_tests.cpp +++ b/unit_tests/helpers/per_thread_data_tests.cpp @@ -16,7 +16,7 @@ #include "patch_shared.h" -using namespace OCLRT; +using namespace NEO; template struct PerThreadDataTests : public DeviceFixture, diff --git a/unit_tests/helpers/queue_helpers_tests.cpp b/unit_tests/helpers/queue_helpers_tests.cpp index 394d1c3f1e..0e55b1ecef 100644 --- a/unit_tests/helpers/queue_helpers_tests.cpp +++ b/unit_tests/helpers/queue_helpers_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(ReleaseQueueTest, givenCommandQueueWithoutVirtualEventWhenReleaseQueueIsCalledThenCmdQInternalRefCountIsNotDecremented) { cl_int retVal = CL_SUCCESS; diff --git a/unit_tests/helpers/string_to_hash_tests.cpp b/unit_tests/helpers/string_to_hash_tests.cpp index 9c0da08a0c..0bab0792df 100644 --- a/unit_tests/helpers/string_to_hash_tests.cpp +++ b/unit_tests/helpers/string_to_hash_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using OCLRT::Hash; +using NEO::Hash; TEST(CreateCombinedStrings, singleString) { std::string dstString; diff --git a/unit_tests/helpers/task_information_tests.cpp b/unit_tests/helpers/task_information_tests.cpp index 0813f78d33..3be0e2720f 100644 --- a/unit_tests/helpers/task_information_tests.cpp +++ b/unit_tests/helpers/task_information_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(CommandTest, mapUnmapSubmitWithoutTerminateFlagFlushesCsr) { std::unique_ptr device(MockDevice::createWithNewExecutionEnvironment(nullptr)); diff --git a/unit_tests/helpers/timestamp_packet_tests.cpp b/unit_tests/helpers/timestamp_packet_tests.cpp index 41f22b9156..a874963d00 100644 --- a/unit_tests/helpers/timestamp_packet_tests.cpp +++ b/unit_tests/helpers/timestamp_packet_tests.cpp @@ -25,7 +25,7 @@ #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; struct TimestampPacketSimpleTests : public ::testing::Test { class MockTimestampPacket : public TimestampPacket { @@ -591,7 +591,7 @@ HWTEST_F(TimestampPacketTests, givenEventsRequestWhenEstimatingStreamSizeForCsrT auto sizeWithoutEvents = csr.getRequiredCmdStreamSize(flags, *device); - flags.csrDependencies.fillFromEventsRequestAndMakeResident(eventsRequest, csr, OCLRT::CsrDependencies::DependenciesType::OutOfCsr); + flags.csrDependencies.fillFromEventsRequestAndMakeResident(eventsRequest, csr, NEO::CsrDependencies::DependenciesType::OutOfCsr); auto sizeWithEvents = csr.getRequiredCmdStreamSize(flags, *device); size_t extendedSize = sizeWithoutEvents + ((1 + 2 + 3 + 4 + 5) * (sizeof(typename FamilyType::MI_SEMAPHORE_WAIT) + sizeof(typename FamilyType::MI_ATOMIC))); @@ -633,7 +633,7 @@ HWTEST_F(TimestampPacketTests, givenEventsRequestWhenEstimatingStreamSizeForDiff auto sizeWithoutEvents = csr.getRequiredCmdStreamSize(flags, *device.get()); - flags.csrDependencies.fillFromEventsRequestAndMakeResident(eventsRequest, csr, OCLRT::CsrDependencies::DependenciesType::OutOfCsr); + flags.csrDependencies.fillFromEventsRequestAndMakeResident(eventsRequest, csr, NEO::CsrDependencies::DependenciesType::OutOfCsr); auto sizeWithEvents = csr.getRequiredCmdStreamSize(flags, *device.get()); size_t extendedSize = sizeWithoutEvents + ((1 + 2 + 3 + 4 + 5) * (sizeof(typename FamilyType::MI_SEMAPHORE_WAIT) + sizeof(typename FamilyType::MI_ATOMIC))); diff --git a/unit_tests/helpers/transfer_properties_tests.cpp b/unit_tests/helpers/transfer_properties_tests.cpp index c1430310aa..f67709dc85 100644 --- a/unit_tests/helpers/transfer_properties_tests.cpp +++ b/unit_tests/helpers/transfer_properties_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(TransferPropertiesTest, givenTransferPropertiesCreatedWhenDefaultDebugSettingThenLockPtrIsNotSet) { MockBuffer buffer; diff --git a/unit_tests/helpers/uint16_sse4_tests.cpp b/unit_tests/helpers/uint16_sse4_tests.cpp index 85f5386243..1aedcd070f 100644 --- a/unit_tests/helpers/uint16_sse4_tests.cpp +++ b/unit_tests/helpers/uint16_sse4_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(Uint16_Sse4, booleanOperator) { EXPECT_TRUE(static_cast(uint16x8_t::mask())); diff --git a/unit_tests/helpers/unit_test_helper.h b/unit_tests/helpers/unit_test_helper.h index 3cab0dbcfb..7361929a05 100644 --- a/unit_tests/helpers/unit_test_helper.h +++ b/unit_tests/helpers/unit_test_helper.h @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { class Kernel; struct HardwareInfo; @@ -28,4 +28,4 @@ struct UnitTestHelper { static bool evaluateGshAddressForScratchSpace(uint64_t usedScratchGpuAddress, uint64_t retrievedGshAddress); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/unit_test_helper.inl b/unit_tests/helpers/unit_test_helper.inl index 1e49181444..88e7420432 100644 --- a/unit_tests/helpers/unit_test_helper.inl +++ b/unit_tests/helpers/unit_test_helper.inl @@ -5,7 +5,7 @@ * */ -namespace OCLRT { +namespace NEO { template bool UnitTestHelper::isL3ConfigProgrammable() { @@ -44,4 +44,4 @@ template bool UnitTestHelper::evaluateGshAddressForScratchSpace(uint64_t usedScratchGpuAddress, uint64_t retrievedGshAddress) { return usedScratchGpuAddress == retrievedGshAddress; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/helpers/validator_tests.cpp b/unit_tests/helpers/validator_tests.cpp index 67dbd1ecc6..340344cee5 100644 --- a/unit_tests/helpers/validator_tests.cpp +++ b/unit_tests/helpers/validator_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; template struct ValidatorFixture : public ::testing::Test { diff --git a/unit_tests/helpers/windows/gl_helper_tests.cpp b/unit_tests/helpers/windows/gl_helper_tests.cpp index 221a8e2af7..f923b3cf86 100644 --- a/unit_tests/helpers/windows/gl_helper_tests.cpp +++ b/unit_tests/helpers/windows/gl_helper_tests.cpp @@ -17,7 +17,7 @@ typedef const char *(__cdecl *funcType)(); -namespace OCLRT { +namespace NEO { class glFunctionHelperMock : public glFunctionHelper { public: glFunctionHelperMock(OsLibrary *glLibrary, const std::string &functionName) : glFunctionHelper(glLibrary, functionName) {} @@ -48,4 +48,4 @@ TEST(glFunctionHelper, givenRealFunctionNameWhenCreateGlFunctionHelperThenGetPoi funcType function = loader["realFunction"]; EXPECT_STREQ(realFunction(), function()); } -}; // namespace OCLRT +}; // namespace NEO diff --git a/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp b/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp index cbd0ed447f..50baf822da 100644 --- a/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp +++ b/unit_tests/helpers/windows/kmd_notify_windows_tests.cpp @@ -11,7 +11,7 @@ #include "test.h" #include "unit_tests/helpers/variable_backup.h" -namespace OCLRT { +namespace NEO { namespace SysCalls { extern BOOL systemPowerStatusRetVal; @@ -69,4 +69,4 @@ TEST(KmdNotifyWindowsTests, givenTaskCountDiffGreaterThanOneWhenBaseTimeoutReque EXPECT_EQ(localProperties.delayKmdNotifyMicroseconds, helper.getBaseTimeout(multiplier)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.cpp b/unit_tests/indirect_heap/indirect_heap_fixture.cpp index f6576af4de..5a47279ce4 100644 --- a/unit_tests/indirect_heap/indirect_heap_fixture.cpp +++ b/unit_tests/indirect_heap/indirect_heap_fixture.cpp @@ -9,11 +9,11 @@ #include "runtime/command_queue/command_queue.h" -namespace OCLRT { +namespace NEO { void IndirectHeapFixture::SetUp(CommandQueue *pCmdQ) { pDSH = &pCmdQ->getIndirectHeap(IndirectHeap::DYNAMIC_STATE, 8192); pSSH = &pCmdQ->getIndirectHeap(IndirectHeap::SURFACE_STATE, 4096); pIOH = &pCmdQ->getIndirectHeap(IndirectHeap::INDIRECT_OBJECT, 4096); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/indirect_heap/indirect_heap_fixture.h b/unit_tests/indirect_heap/indirect_heap_fixture.h index 65cd2fca4f..24f7f104de 100644 --- a/unit_tests/indirect_heap/indirect_heap_fixture.h +++ b/unit_tests/indirect_heap/indirect_heap_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/indirect_heap/indirect_heap.h" -namespace OCLRT { +namespace NEO { class CommandQueue; @@ -27,4 +27,4 @@ struct IndirectHeapFixture { IndirectHeap *pIOH; IndirectHeap *pSSH; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/indirect_heap/indirect_heap_tests.cpp b/unit_tests/indirect_heap/indirect_heap_tests.cpp index a241895e27..a7612e6a51 100644 --- a/unit_tests/indirect_heap/indirect_heap_tests.cpp +++ b/unit_tests/indirect_heap/indirect_heap_tests.cpp @@ -9,7 +9,7 @@ #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -using namespace OCLRT; +using namespace NEO; struct IndirectHeapTest : public ::testing::Test { uint8_t buffer[256]; diff --git a/unit_tests/instrumentation/instrumentation_tests.cpp b/unit_tests/instrumentation/instrumentation_tests.cpp index fed7b58c02..9e4afd7d5c 100644 --- a/unit_tests/instrumentation/instrumentation_tests.cpp +++ b/unit_tests/instrumentation/instrumentation_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" #include "instrumentation.h" -using namespace OCLRT; +using namespace NEO; struct InstrumentationTest : public ::testing::Test { InstrumentationTest() {} diff --git a/unit_tests/kernel/clone_kernel_tests.cpp b/unit_tests/kernel/clone_kernel_tests.cpp index 48e12cd823..4929b50712 100644 --- a/unit_tests/kernel/clone_kernel_tests.cpp +++ b/unit_tests/kernel/clone_kernel_tests.cpp @@ -27,7 +27,7 @@ #include -using namespace OCLRT; +using namespace NEO; class CloneKernelFixture : public ContextFixture, public DeviceFixture { using ContextFixture::SetUp; diff --git a/unit_tests/kernel/debug_kernel_tests.cpp b/unit_tests/kernel/debug_kernel_tests.cpp index f4cf0d6f84..0fdbcb1767 100644 --- a/unit_tests/kernel/debug_kernel_tests.cpp +++ b/unit_tests/kernel/debug_kernel_tests.cpp @@ -13,7 +13,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(DebugKernelTest, givenKernelCompiledForDebuggingWhenGetDebugSurfaceBtiIsCalledThenCorrectValueIsReturned) { auto device = std::make_unique(*platformDevices[0]); diff --git a/unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp b/unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp index 483de00bb3..8743a69738 100644 --- a/unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp +++ b/unit_tests/kernel/gl/kernel_arg_buffer_tests.cpp @@ -25,7 +25,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test KernelArgBufferTest; diff --git a/unit_tests/kernel/image_transformer_tests.cpp b/unit_tests/kernel/image_transformer_tests.cpp index 7cc9b8b0e5..20c392c775 100644 --- a/unit_tests/kernel/image_transformer_tests.cpp +++ b/unit_tests/kernel/image_transformer_tests.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/fixtures/image_fixture.h" -using namespace OCLRT; +using namespace NEO; class ImageTransformerTest : public ::testing::Test { public: diff --git a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp index 710900f337..05fad384e8 100644 --- a/unit_tests/kernel/kernel_accelerator_arg_tests.cpp +++ b/unit_tests/kernel/kernel_accelerator_arg_tests.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelArgAcceleratorFixture : public ContextFixture, public DeviceFixture { diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp index 3f2ae1a198..86e5ec64e3 100644 --- a/unit_tests/kernel/kernel_arg_buffer_fixture.cpp +++ b/unit_tests/kernel/kernel_arg_buffer_fixture.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; void KernelArgBufferFixture::SetUp() { DeviceFixture::SetUp(); diff --git a/unit_tests/kernel/kernel_arg_buffer_fixture.h b/unit_tests/kernel/kernel_arg_buffer_fixture.h index 57e54e8349..6b9584d4f0 100644 --- a/unit_tests/kernel/kernel_arg_buffer_fixture.h +++ b/unit_tests/kernel/kernel_arg_buffer_fixture.h @@ -21,7 +21,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelArgBufferFixture : public ContextFixture, public DeviceFixture { diff --git a/unit_tests/kernel/kernel_arg_buffer_tests.cpp b/unit_tests/kernel/kernel_arg_buffer_tests.cpp index 860ee702d0..be2e427e52 100644 --- a/unit_tests/kernel/kernel_arg_buffer_tests.cpp +++ b/unit_tests/kernel/kernel_arg_buffer_tests.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test KernelArgBufferTest; diff --git a/unit_tests/kernel/kernel_arg_dev_queue_tests.cpp b/unit_tests/kernel/kernel_arg_dev_queue_tests.cpp index 41c0c319c7..cbe1db605d 100644 --- a/unit_tests/kernel/kernel_arg_dev_queue_tests.cpp +++ b/unit_tests/kernel/kernel_arg_dev_queue_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; using namespace DeviceHostQueue; struct KernelArgDevQueueTest : public DeviceFixture, diff --git a/unit_tests/kernel/kernel_arg_info_tests.cpp b/unit_tests/kernel/kernel_arg_info_tests.cpp index ee476957c8..94cf553fd2 100644 --- a/unit_tests/kernel/kernel_arg_info_tests.cpp +++ b/unit_tests/kernel/kernel_arg_info_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/program/program_tests.h" #include "unit_tests/program/program_with_source.h" -using namespace OCLRT; +using namespace NEO; class KernelArgInfoTest : public ProgramFromSourceTest { public: diff --git a/unit_tests/kernel/kernel_arg_pipe_tests.cpp b/unit_tests/kernel/kernel_arg_pipe_tests.cpp index 65266e7957..c7a7dc6d34 100644 --- a/unit_tests/kernel/kernel_arg_pipe_tests.cpp +++ b/unit_tests/kernel/kernel_arg_pipe_tests.cpp @@ -21,7 +21,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelArgPipeFixture : public ContextFixture, public DeviceFixture { diff --git a/unit_tests/kernel/kernel_arg_svm_tests.cpp b/unit_tests/kernel/kernel_arg_svm_tests.cpp index 10e9da059c..545e1964f4 100644 --- a/unit_tests/kernel/kernel_arg_svm_tests.cpp +++ b/unit_tests/kernel/kernel_arg_svm_tests.cpp @@ -20,7 +20,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelArgSvmFixture_ : public ContextFixture, public DeviceFixture { diff --git a/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp b/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp index 052fbaa377..6b552f9073 100644 --- a/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/unit_tests/kernel/kernel_cache_flush_requirements_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" -using namespace OCLRT; +using namespace NEO; TEST(KernelWithCasheFlushTests, givenDeviceWhichDoesntRequireCasheFlushWhenCheckIfKernelRequierFlushThenReturnedFalse) { auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(platformDevices[0])); diff --git a/unit_tests/kernel/kernel_image_arg_tests.cpp b/unit_tests/kernel/kernel_image_arg_tests.cpp index 2909e89021..d81afa170d 100644 --- a/unit_tests/kernel/kernel_image_arg_tests.cpp +++ b/unit_tests/kernel/kernel_image_arg_tests.cpp @@ -18,7 +18,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST_F(KernelImageArgTest, GIVENkernelWithImageArgsWHENcheckDifferentScenariosTHENproperBehaviour) { size_t imageWidth = image->getImageDesc().image_width; diff --git a/unit_tests/kernel/kernel_immediate_arg_tests.cpp b/unit_tests/kernel/kernel_immediate_arg_tests.cpp index c20f305f90..bf8fbf132f 100644 --- a/unit_tests/kernel/kernel_immediate_arg_tests.cpp +++ b/unit_tests/kernel/kernel_immediate_arg_tests.cpp @@ -15,7 +15,7 @@ #include "CL/cl.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; template class KernelArgImmediateTest : public Test { diff --git a/unit_tests/kernel/kernel_is_patched_tests.cpp b/unit_tests/kernel/kernel_is_patched_tests.cpp index 491e025fb1..4e2aadf01c 100644 --- a/unit_tests/kernel/kernel_is_patched_tests.cpp +++ b/unit_tests/kernel/kernel_is_patched_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class PatchedKernelTest : public ::testing::Test { public: diff --git a/unit_tests/kernel/kernel_reflection_surface_tests.cpp b/unit_tests/kernel/kernel_reflection_surface_tests.cpp index eeeea91a82..2767e645d5 100644 --- a/unit_tests/kernel/kernel_reflection_surface_tests.cpp +++ b/unit_tests/kernel/kernel_reflection_surface_tests.cpp @@ -27,7 +27,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; typedef ExecutionModelKernelFixture KernelReflectionSurfaceTest; typedef ExecutionModelKernelTest KernelReflectionSurfaceWithQueueTest; diff --git a/unit_tests/kernel/kernel_slm_arg_tests.cpp b/unit_tests/kernel/kernel_slm_arg_tests.cpp index 4c1b447c84..98bf251791 100644 --- a/unit_tests/kernel/kernel_slm_arg_tests.cpp +++ b/unit_tests/kernel/kernel_slm_arg_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class KernelSlmArgTest : public Test { protected: diff --git a/unit_tests/kernel/kernel_slm_tests.cpp b/unit_tests/kernel/kernel_slm_tests.cpp index c6aecf419f..3e1c5f682f 100644 --- a/unit_tests/kernel/kernel_slm_tests.cpp +++ b/unit_tests/kernel/kernel_slm_tests.cpp @@ -16,7 +16,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; struct KernelSLMAndBarrierTest : public DeviceFixture, public ::testing::TestWithParam { diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 73082e9028..bf4e31b595 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -35,7 +35,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelTest : public ProgramFromBinaryTest { public: @@ -1769,7 +1769,7 @@ HWTEST_F(KernelResidencyTest, test_MakeArgsResidentCheckImageFromImage) { cl_int retVal; MockContext context; - std::unique_ptr imageNV12(Image::create(&context, flags, surfaceFormat, &imageDesc, nullptr, retVal)); + std::unique_ptr imageNV12(Image::create(&context, flags, surfaceFormat, &imageDesc, nullptr, retVal)); EXPECT_EQ(imageNV12->getMediaPlaneType(), 0u); //create Y plane @@ -1782,7 +1782,7 @@ HWTEST_F(KernelResidencyTest, test_MakeArgsResidentCheckImageFromImage) { imageDesc.image_depth = 0; imageDesc.mem_object = imageNV12.get(); - std::unique_ptr imageY(Image::create(&context, flags, surfaceFormat, &imageDesc, nullptr, retVal)); + std::unique_ptr imageY(Image::create(&context, flags, surfaceFormat, &imageDesc, nullptr, retVal)); EXPECT_EQ(imageY->getMediaPlaneType(), 0u); auto pKernelInfo = std::make_unique(); diff --git a/unit_tests/kernel/kernel_transformable_tests.cpp b/unit_tests/kernel/kernel_transformable_tests.cpp index 8f7b32139b..d04c029a38 100644 --- a/unit_tests/kernel/kernel_transformable_tests.cpp +++ b/unit_tests/kernel/kernel_transformable_tests.cpp @@ -16,7 +16,7 @@ #include -using namespace OCLRT; +using namespace NEO; class KernelTransformableTest : public ::testing::Test { public: diff --git a/unit_tests/kernel/parent_kernel_tests.cpp b/unit_tests/kernel/parent_kernel_tests.cpp index f8df953b94..07414a48d8 100644 --- a/unit_tests/kernel/parent_kernel_tests.cpp +++ b/unit_tests/kernel/parent_kernel_tests.cpp @@ -13,7 +13,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef ExecutionModelKernelFixture ParentKernelFromBinaryTest; diff --git a/unit_tests/kernel/substitute_kernel_heap_tests.cpp b/unit_tests/kernel/substitute_kernel_heap_tests.cpp index 111966d0e7..e31f17429e 100644 --- a/unit_tests/kernel/substitute_kernel_heap_tests.cpp +++ b/unit_tests/kernel/substitute_kernel_heap_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/mocks/mock_kernel.h" -using namespace OCLRT; +using namespace NEO; typedef Test KernelSubstituteTest; diff --git a/unit_tests/libult/create_command_stream.cpp b/unit_tests/libult/create_command_stream.cpp index d79aa42203..95e23b8d54 100644 --- a/unit_tests/libult/create_command_stream.cpp +++ b/unit_tests/libult/create_command_stream.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE]; bool getDevicesResult = true; @@ -48,4 +48,4 @@ bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvi return getDevicesImpl(hwInfo, numDevicesReturned, executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/create_command_stream.h b/unit_tests/libult/create_command_stream.h index e9b9e9324c..9bb4242688 100644 --- a/unit_tests/libult/create_command_stream.h +++ b/unit_tests/libult/create_command_stream.h @@ -7,11 +7,11 @@ #include "runtime/command_stream/command_stream_receiver.h" -namespace OCLRT { +namespace NEO { extern bool overrideCommandStreamReceiverCreation; extern bool overrideDeviceWithDefaultHardwareInfo; extern bool overrideMemoryManagerCreation; extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment); extern bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/create_tbx_sockets.cpp b/unit_tests/libult/create_tbx_sockets.cpp index 386c8d0522..29a876e7ce 100644 --- a/unit_tests/libult/create_tbx_sockets.cpp +++ b/unit_tests/libult/create_tbx_sockets.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,11 +9,11 @@ #include "unit_tests/mocks/mock_tbx_sockets.h" #include "unit_tests/tests_configuration.h" -namespace OCLRT { +namespace NEO { TbxSockets *TbxSockets::create() { if (testMode == TestMode::AubTestsWithTbx) { return new TbxSocketsImp; } return new MockTbxSockets; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/gen10.cpp b/unit_tests/libult/gen10.cpp index 4152ff5886..95b8402e81 100644 --- a/unit_tests/libult/gen10.cpp +++ b/unit_tests/libult/gen10.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/helpers/base_object.h" #include "unit_tests/libult/ult_command_stream_receiver.h" -namespace OCLRT { +namespace NEO { typedef CNLFamily Family; @@ -30,4 +30,4 @@ struct enableGen10 { static enableGen10 enable; template class UltCommandStreamReceiver; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/gen8.cpp b/unit_tests/libult/gen8.cpp index b159904d2c..a27a4f0be3 100644 --- a/unit_tests/libult/gen8.cpp +++ b/unit_tests/libult/gen8.cpp @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/helpers/base_object.h" #include "unit_tests/libult/ult_command_stream_receiver.h" -namespace OCLRT { +namespace NEO { typedef BDWFamily Family; @@ -45,4 +30,4 @@ struct enableGen8 { static enableGen8 enable; template class UltCommandStreamReceiver; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/gen9.cpp b/unit_tests/libult/gen9.cpp index 72fbab5f1d..abd38f0f79 100644 --- a/unit_tests/libult/gen9.cpp +++ b/unit_tests/libult/gen9.cpp @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/helpers/base_object.h" #include "unit_tests/libult/ult_command_stream_receiver.h" -namespace OCLRT { +namespace NEO { typedef SKLFamily Family; @@ -45,4 +30,4 @@ struct enableGen9 { static enableGen9 enable; template class UltCommandStreamReceiver; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/mock_gfx_family.cpp b/unit_tests/libult/mock_gfx_family.cpp index b00ff1be08..de6645c6db 100644 --- a/unit_tests/libult/mock_gfx_family.cpp +++ b/unit_tests/libult/mock_gfx_family.cpp @@ -18,7 +18,7 @@ #include "runtime/helpers/kernel_commands_base.inl" #include "runtime/helpers/preamble.inl" -namespace OCLRT { +namespace NEO { static AubMemDump::LrcaHelperRcs rcs(0x000000); static AubMemDump::LrcaHelperBcs bcs(0x020000); @@ -187,4 +187,4 @@ struct L3CNTLRegisterOffset { template struct PreambleHelper; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/mock_gfx_family.h b/unit_tests/libult/mock_gfx_family.h index e3027cdae0..405d017a7b 100644 --- a/unit_tests/libult/mock_gfx_family.h +++ b/unit_tests/libult/mock_gfx_family.h @@ -9,7 +9,7 @@ #include "runtime/gen_common/aub_mapper_base.h" #include "runtime/helpers/hw_helper.h" -namespace OCLRT { +namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; @@ -540,4 +540,4 @@ struct AUBFamilyMapper { static const MMIOList *perEngineMMIO[EngineType::NUM_ENGINES]; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/os_interface.cpp b/unit_tests/libult/os_interface.cpp index 790b940c06..ba153fa42c 100644 --- a/unit_tests/libult/os_interface.cpp +++ b/unit_tests/libult/os_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/os_interface/os_interface.h" -namespace OCLRT { +namespace NEO { bool OSInterface::osEnableLocalMemory = true; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/libult/source_level_debugger.cpp b/unit_tests/libult/source_level_debugger.cpp index 1ab8fe356c..3a16342afd 100644 --- a/unit_tests/libult/source_level_debugger.cpp +++ b/unit_tests/libult/source_level_debugger.cpp @@ -9,9 +9,9 @@ #include "unit_tests/libult/source_level_debugger_library.h" -namespace OCLRT { +namespace NEO { OsLibrary *SourceLevelDebugger::loadDebugger() { return DebuggerLibrary::load(SourceLevelDebugger::dllName); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/libult/source_level_debugger_library.cpp b/unit_tests/libult/source_level_debugger_library.cpp index 0757e0f72e..d5a85f9806 100644 --- a/unit_tests/libult/source_level_debugger_library.cpp +++ b/unit_tests/libult/source_level_debugger_library.cpp @@ -9,7 +9,7 @@ #include "runtime/helpers/string.h" -using namespace OCLRT; +using namespace NEO; bool DebuggerLibrary::debuggerActive = false; bool DebuggerLibrary::isLibraryAvailable = false; diff --git a/unit_tests/libult/source_level_debugger_library.h b/unit_tests/libult/source_level_debugger_library.h index 5ac04721fb..eec1c2424a 100644 --- a/unit_tests/libult/source_level_debugger_library.h +++ b/unit_tests/libult/source_level_debugger_library.h @@ -43,7 +43,7 @@ struct DebuggerLibraryInterceptor { int deviceDestructionRetVal = 0; }; -class DebuggerLibrary : public OCLRT::OsLibrary { +class DebuggerLibrary : public NEO::OsLibrary { public: DebuggerLibrary() = default; void *getProcAddress(const std::string &procName) override; diff --git a/unit_tests/libult/ult_command_stream_receiver.h b/unit_tests/libult/ult_command_stream_receiver.h index bad97630ee..ee6e236a2b 100644 --- a/unit_tests/libult/ult_command_stream_receiver.h +++ b/unit_tests/libult/ult_command_stream_receiver.h @@ -14,7 +14,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GmmPageTableMngr; @@ -148,4 +148,4 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw, publ std::unique_ptr tempPreemptionLocation; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/linux/drm_null_device_tests.cpp b/unit_tests/linux/drm_null_device_tests.cpp index 27bc141194..46db84cfc4 100644 --- a/unit_tests/linux/drm_null_device_tests.cpp +++ b/unit_tests/linux/drm_null_device_tests.cpp @@ -10,7 +10,7 @@ #include "mock_os_layer.h" -using namespace OCLRT; +using namespace NEO; class DrmWrap : public Drm { public: diff --git a/unit_tests/linux/linux_tests_configuration.cpp b/unit_tests/linux/linux_tests_configuration.cpp index 9997831299..d8450206c4 100644 --- a/unit_tests/linux/linux_tests_configuration.cpp +++ b/unit_tests/linux/linux_tests_configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,6 @@ #include "unit_tests/tests_configuration.h" -namespace OCLRT { +namespace NEO { TestMode testMode = TestMode::NotSpecified; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/linux/main_linux.cpp b/unit_tests/linux/main_linux.cpp index 2c87b75171..d983fa2e2d 100644 --- a/unit_tests/linux/main_linux.cpp +++ b/unit_tests/linux/main_linux.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/custom_event_listener.h" -using namespace OCLRT; +using namespace NEO; int main(int argc, char **argv) { bool useDefaultListener = false; diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp index 097276df25..49899d6dd8 100644 --- a/unit_tests/linux/main_linux_dll.cpp +++ b/unit_tests/linux/main_linux_dll.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; class DrmWrap : public Drm { public: @@ -319,7 +319,7 @@ TEST_F(DrmTests, failOnInvalidDeviceName) { } TEST(AllocatorHelper, givenExpectedSizeToMapWhenGetSizetoMapCalledThenExpectedValueReturned) { - EXPECT_EQ((alignUp(4 * GB - 8096, 4096)), OCLRT::getSizeToMap()); + EXPECT_EQ((alignUp(4 * GB - 8096, 4096)), NEO::getSizeToMap()); } TEST(DrmMemoryManagerCreate, whenCallCreateMemoryManagerThenDrmMemoryManagerIsCreated) { diff --git a/unit_tests/linux/mock_os_layer.cpp b/unit_tests/linux/mock_os_layer.cpp index 72e7834c25..9642cb8c90 100644 --- a/unit_tests/linux/mock_os_layer.cpp +++ b/unit_tests/linux/mock_os_layer.cpp @@ -15,7 +15,7 @@ int (*c_ioctl)(int fd, unsigned long int request, ...) = nullptr; int fakeFd = 1023; int haveDri = 0; // index of dri to serve, -1 - none -int deviceId = OCLRT::deviceDescriptorTable[0].deviceId; // default supported DeviceID +int deviceId = NEO::deviceDescriptorTable[0].deviceId; // default supported DeviceID int haveSoftPin = 1; int havePreemption = I915_SCHEDULER_CAP_ENABLED | I915_SCHEDULER_CAP_PRIORITY | diff --git a/unit_tests/linux/mock_os_layer.h b/unit_tests/linux/mock_os_layer.h index a999765bd8..ec5221571d 100644 --- a/unit_tests/linux/mock_os_layer.h +++ b/unit_tests/linux/mock_os_layer.h @@ -43,12 +43,12 @@ extern char providedDrmVersion[5]; extern int ioctlSeq[8]; extern size_t ioctlCnt; -extern std::array drms; +extern std::array drms; inline void resetOSMockGlobalState() { fakeFd = 1023; haveDri = 0; - deviceId = OCLRT::deviceDescriptorTable[0].deviceId; + deviceId = NEO::deviceDescriptorTable[0].deviceId; haveSoftPin = 1; failOnDeviceId = 0; failOnRevisionId = 0; diff --git a/unit_tests/linux/va_tests.cpp b/unit_tests/linux/va_tests.cpp index c2d4640d11..d18ad87611 100644 --- a/unit_tests/linux/va_tests.cpp +++ b/unit_tests/linux/va_tests.cpp @@ -9,7 +9,7 @@ #include "test.h" #include "unit_tests/helpers/variable_backup.h" -using namespace OCLRT; +using namespace NEO; TEST(VaTests, whenLibvaSo2IsNotInstalledThenFail) { VariableBackup dlopenBackup(&VASharingFunctions::fdlopen); diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index af8a1750a3..82cbe167f6 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -38,7 +38,7 @@ const char *fSeparator = "\\"; const char *fSeparator = "/"; #endif -namespace OCLRT { +namespace NEO { extern const char *hardwarePrefix[]; extern const HardwareInfo *hardwareInfoTable[IGFX_MAX_PRODUCT]; @@ -48,13 +48,13 @@ extern TestMode testMode; extern const char *executionDirectorySuffix; std::thread::id tempThreadID; -} // namespace OCLRT +} // namespace NEO namespace Os { extern const char *gmmDllName; extern const char *gmmEntryName; } // namespace Os -using namespace OCLRT; +using namespace NEO; TestEnvironment *gEnvironment; PRODUCT_FAMILY productFamily = IGFX_SKYLAKE; @@ -347,7 +347,7 @@ int main(int argc, char **argv) { clFiles = nClFiles; std::string executionDirectory(hardwarePrefix[productFamily]); - executionDirectory += OCLRT::executionDirectorySuffix; // _aub for aub_tests, empty otherwise + executionDirectory += NEO::executionDirectorySuffix; // _aub for aub_tests, empty otherwise #ifdef WIN32 #include @@ -396,7 +396,7 @@ int main(int argc, char **argv) { #if defined(__linux__) //ULTs timeout if (enable_alarm) { - unsigned int alarmTime = OCLRT::ultIterationMaxTime * ::testing::GTEST_FLAG(repeat); + unsigned int alarmTime = NEO::ultIterationMaxTime * ::testing::GTEST_FLAG(repeat); struct sigaction sa; sa.sa_handler = &handle_SIGALRM; diff --git a/unit_tests/mem_obj/buffer_pin_tests.cpp b/unit_tests/mem_obj/buffer_pin_tests.cpp index dda707d62e..66b7fb1038 100644 --- a/unit_tests/mem_obj/buffer_pin_tests.cpp +++ b/unit_tests/mem_obj/buffer_pin_tests.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class TestedMemoryManager : public OsAgnosticMemoryManager { public: diff --git a/unit_tests/mem_obj/buffer_set_arg_tests.cpp b/unit_tests/mem_obj/buffer_set_arg_tests.cpp index 381e38016e..9c273e7282 100644 --- a/unit_tests/mem_obj/buffer_set_arg_tests.cpp +++ b/unit_tests/mem_obj/buffer_set_arg_tests.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class BufferSetArgTest : public ContextFixture, public DeviceFixture, diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index a38c66318e..f889480311 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -32,7 +32,7 @@ #include "gtest/gtest.h" #include "mem_obj_types.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int g_scTestBufferSizeInBytes = 16; @@ -667,7 +667,7 @@ TEST_P(NoHostPtr, GivenNoHostPtrWhenHwBufferCreationFailsThenReturnNullptr) { bool, bool, bool) - -> OCLRT::Buffer * { return nullptr; }; + -> NEO::Buffer * { return nullptr; }; } auto buffer = Buffer::create( diff --git a/unit_tests/mem_obj/create_image_format_tests.cpp b/unit_tests/mem_obj/create_image_format_tests.cpp index d6baf903da..0fb105a3d8 100644 --- a/unit_tests/mem_obj/create_image_format_tests.cpp +++ b/unit_tests/mem_obj/create_image_format_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 32; diff --git a/unit_tests/mem_obj/destructor_callback_tests.cpp b/unit_tests/mem_obj/destructor_callback_tests.cpp index 123fab2994..954b54bcd1 100644 --- a/unit_tests/mem_obj/destructor_callback_tests.cpp +++ b/unit_tests/mem_obj/destructor_callback_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class DestructorCallbackFixture : public MemoryManagementFixture { public: diff --git a/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp index 3eea25ded8..24aa4d2ad5 100644 --- a/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp +++ b/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct GetMemObjectSubBufferInfo : public ::testing::Test { GetMemObjectSubBufferInfo() diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_tests.cpp index ddd3db8855..bea64103d1 100644 --- a/unit_tests/mem_obj/get_mem_object_info_tests.cpp +++ b/unit_tests/mem_obj/get_mem_object_info_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; class GetMemObjectInfo : public ::testing::Test, public PlatformFixture, public DeviceFixture { using DeviceFixture::SetUp; diff --git a/unit_tests/mem_obj/image1d_tests.cpp b/unit_tests/mem_obj/image1d_tests.cpp index 691a4f3417..6ff68ac44f 100644 --- a/unit_tests/mem_obj/image1d_tests.cpp +++ b/unit_tests/mem_obj/image1d_tests.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 32; diff --git a/unit_tests/mem_obj/image2d_from_buffer_tests.cpp b/unit_tests/mem_obj/image2d_from_buffer_tests.cpp index 95f33e7bc5..ef94cb55a2 100644 --- a/unit_tests/mem_obj/image2d_from_buffer_tests.cpp +++ b/unit_tests/mem_obj/image2d_from_buffer_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_gmm.h" -using namespace OCLRT; +using namespace NEO; // Tests for cl_khr_image2d_from_buffer class Image2dFromBufferTest : public DeviceFixture, public ::testing::Test { diff --git a/unit_tests/mem_obj/image2d_tests.cpp b/unit_tests/mem_obj/image2d_tests.cpp index 0fc285a8d2..540f17436c 100644 --- a/unit_tests/mem_obj/image2d_tests.cpp +++ b/unit_tests/mem_obj/image2d_tests.cpp @@ -12,7 +12,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 32; diff --git a/unit_tests/mem_obj/image3d_tests.cpp b/unit_tests/mem_obj/image3d_tests.cpp index 00c2566037..b8428e0e27 100644 --- a/unit_tests/mem_obj/image3d_tests.cpp +++ b/unit_tests/mem_obj/image3d_tests.cpp @@ -14,7 +14,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 31; diff --git a/unit_tests/mem_obj/image_array_size_tests.cpp b/unit_tests/mem_obj/image_array_size_tests.cpp index 7476c28615..696fceaec6 100644 --- a/unit_tests/mem_obj/image_array_size_tests.cpp +++ b/unit_tests/mem_obj/image_array_size_tests.cpp @@ -13,7 +13,7 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 17; diff --git a/unit_tests/mem_obj/image_compression_fixture.h b/unit_tests/mem_obj/image_compression_fixture.h index 1f2b029605..d36e462a44 100644 --- a/unit_tests/mem_obj/image_compression_fixture.h +++ b/unit_tests/mem_obj/image_compression_fixture.h @@ -12,7 +12,7 @@ #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; class ImageCompressionTests : public ::testing::Test { public: diff --git a/unit_tests/mem_obj/image_format_tests.cpp b/unit_tests/mem_obj/image_format_tests.cpp index 2861a14750..6bf4761a6d 100644 --- a/unit_tests/mem_obj/image_format_tests.cpp +++ b/unit_tests/mem_obj/image_format_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct MockImage : public Image { using Image::hasAlphaChannel; diff --git a/unit_tests/mem_obj/image_from_subbuffer_tests.cpp b/unit_tests/mem_obj/image_from_subbuffer_tests.cpp index 7cf94dd003..c1ad75f94b 100644 --- a/unit_tests/mem_obj/image_from_subbuffer_tests.cpp +++ b/unit_tests/mem_obj/image_from_subbuffer_tests.cpp @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_context.h" #include -using namespace OCLRT; +using namespace NEO; // Tests for cl_khr_image2d_from_buffer class ImageFromSubBufferTest : public DeviceFixture, public ::testing::Test { diff --git a/unit_tests/mem_obj/image_redescribe_tests.cpp b/unit_tests/mem_obj/image_redescribe_tests.cpp index c5699358de..59f628fdf4 100644 --- a/unit_tests/mem_obj/image_redescribe_tests.cpp +++ b/unit_tests/mem_obj/image_redescribe_tests.cpp @@ -17,7 +17,7 @@ extern GFXCORE_FAMILY renderCoreFamily; -using namespace OCLRT; +using namespace NEO; class ImageRedescribeTest : public testing::TestWithParam> { protected: diff --git a/unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp b/unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp index d03e39d190..c7e15d56fd 100644 --- a/unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp +++ b/unit_tests/mem_obj/image_release_mapped_ptr_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_event.h" -using namespace OCLRT; +using namespace NEO; template class MyMockCommandQueue : public CommandQueueHw { diff --git a/unit_tests/mem_obj/image_set_arg_tests.cpp b/unit_tests/mem_obj/image_set_arg_tests.cpp index b8b7e80b46..4858233a83 100644 --- a/unit_tests/mem_obj/image_set_arg_tests.cpp +++ b/unit_tests/mem_obj/image_set_arg_tests.cpp @@ -25,7 +25,7 @@ #include "gmock/gmock.h" #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; class ImageSetArgTest : public DeviceFixture, diff --git a/unit_tests/mem_obj/image_snorm_tests.cpp b/unit_tests/mem_obj/image_snorm_tests.cpp index a3f2982e50..591a07a4cd 100644 --- a/unit_tests/mem_obj/image_snorm_tests.cpp +++ b/unit_tests/mem_obj/image_snorm_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; const cl_mem_flags flagsForTests[] = {CL_MEM_READ_ONLY, CL_MEM_WRITE_ONLY, CL_MEM_READ_WRITE}; diff --git a/unit_tests/mem_obj/image_tests.cpp b/unit_tests/mem_obj/image_tests.cpp index ce4bc757f4..8e4ef8b8ba 100644 --- a/unit_tests/mem_obj/image_tests.cpp +++ b/unit_tests/mem_obj/image_tests.cpp @@ -25,7 +25,7 @@ #include "unit_tests/mocks/mock_gmm.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; static const unsigned int testImageDimensions = 45; auto channelType = CL_UNORM_INT8; @@ -666,11 +666,11 @@ struct ModifyableImage { static cl_image_format imageFormat; static cl_image_desc imageDesc; static void *hostPtr; - static OCLRT::Context *context; + static NEO::Context *context; }; void *ModifyableImage::hostPtr = nullptr; -OCLRT::Context *ModifyableImage::context = nullptr; +NEO::Context *ModifyableImage::context = nullptr; cl_image_format ModifyableImage::imageFormat; cl_image_desc ModifyableImage::imageDesc; diff --git a/unit_tests/mem_obj/image_tiled_tests.cpp b/unit_tests/mem_obj/image_tiled_tests.cpp index 10c6b1d55f..bb13e8a701 100644 --- a/unit_tests/mem_obj/image_tiled_tests.cpp +++ b/unit_tests/mem_obj/image_tiled_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; static const auto dimension = 16; static auto channelType = CL_UNORM_INT8; diff --git a/unit_tests/mem_obj/image_transfer_tests.cpp b/unit_tests/mem_obj/image_transfer_tests.cpp index 3b6ad797e8..9b150a2f04 100644 --- a/unit_tests/mem_obj/image_transfer_tests.cpp +++ b/unit_tests/mem_obj/image_transfer_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class ImageHostPtrTransferTests : public testing::Test { diff --git a/unit_tests/mem_obj/image_validate_tests.cpp b/unit_tests/mem_obj/image_validate_tests.cpp index 77c102d900..ee216cb93e 100644 --- a/unit_tests/mem_obj/image_validate_tests.cpp +++ b/unit_tests/mem_obj/image_validate_tests.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef decltype(&Image::redescribe) RedescribeMethod; diff --git a/unit_tests/mem_obj/map_operations_handler_tests.cpp b/unit_tests/mem_obj/map_operations_handler_tests.cpp index 6f022cd0ad..53f4023038 100644 --- a/unit_tests/mem_obj/map_operations_handler_tests.cpp +++ b/unit_tests/mem_obj/map_operations_handler_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -11,7 +11,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct MockMapOperationsHandler : public MapOperationsHandler { using MapOperationsHandler::isOverlapping; diff --git a/unit_tests/mem_obj/mem_obj_destruction_tests.cpp b/unit_tests/mem_obj/mem_obj_destruction_tests.cpp index e7a1cf65b5..3f2ad21f38 100644 --- a/unit_tests/mem_obj/mem_obj_destruction_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_destruction_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; template class MyCsr : public UltCommandStreamReceiver { diff --git a/unit_tests/mem_obj/mem_obj_helper_tests.cpp b/unit_tests/mem_obj/mem_obj_helper_tests.cpp index 2b27ef384e..f2a778cd2b 100644 --- a/unit_tests/mem_obj/mem_obj_helper_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_helper_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(MemObjHelper, givenValidMemFlagsForSubBufferWhenFlagsAreCheckedThenTrueIsReturned) { cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_WRITE_ONLY | CL_MEM_READ_ONLY | diff --git a/unit_tests/mem_obj/mem_obj_tests.cpp b/unit_tests/mem_obj/mem_obj_tests.cpp index 37858e5b48..f8cd7b28b5 100644 --- a/unit_tests/mem_obj/mem_obj_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_tests.cpp @@ -21,7 +21,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct MySharingHandler : public SharingHandler { MySharingHandler(MemObj *memObj) : memObj(memObj) { diff --git a/unit_tests/mem_obj/nv12_image_tests.cpp b/unit_tests/mem_obj/nv12_image_tests.cpp index 3956be0e83..d8865f5d59 100644 --- a/unit_tests/mem_obj/nv12_image_tests.cpp +++ b/unit_tests/mem_obj/nv12_image_tests.cpp @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class Nv12ImageTest : public testing::Test { public: diff --git a/unit_tests/mem_obj/packed_yuv_image_tests.cpp b/unit_tests/mem_obj/packed_yuv_image_tests.cpp index 0d04f13ba1..524c262943 100644 --- a/unit_tests/mem_obj/packed_yuv_image_tests.cpp +++ b/unit_tests/mem_obj/packed_yuv_image_tests.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef decltype(&Image::redescribe) RedescribeMethod; diff --git a/unit_tests/mem_obj/pipe_tests.cpp b/unit_tests/mem_obj/pipe_tests.cpp index a22f665bf8..d0cbf3780f 100644 --- a/unit_tests/mem_obj/pipe_tests.cpp +++ b/unit_tests/mem_obj/pipe_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/fixtures/memory_management_fixture.h" #include "unit_tests/mocks/mock_context.h" -using namespace OCLRT; +using namespace NEO; //Tests for pipes diff --git a/unit_tests/mem_obj/sub_buffer_tests.cpp b/unit_tests/mem_obj/sub_buffer_tests.cpp index d35d6745ee..8adaa1610d 100644 --- a/unit_tests/mem_obj/sub_buffer_tests.cpp +++ b/unit_tests/mem_obj/sub_buffer_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; namespace ULT { diff --git a/unit_tests/mem_obj/zero_copy_tests.cpp b/unit_tests/mem_obj/zero_copy_tests.cpp index 29548a1c04..eb79711969 100644 --- a/unit_tests/mem_obj/zero_copy_tests.cpp +++ b/unit_tests/mem_obj/zero_copy_tests.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class ZeroCopyBufferTest : public DeviceFixture, public testing::TestWithParam> { diff --git a/unit_tests/memory_leak_listener.cpp b/unit_tests/memory_leak_listener.cpp index b4c89fdcce..30ccc7b789 100644 --- a/unit_tests/memory_leak_listener.cpp +++ b/unit_tests/memory_leak_listener.cpp @@ -12,14 +12,14 @@ #include "unit_tests/helpers/memory_management.h" using ::testing::TestInfo; -using namespace OCLRT; +using namespace NEO; extern unsigned int numBaseObjects; void MemoryLeakListener::OnTestStart(const TestInfo &testInfo) { numInitialBaseObjects = numBaseObjects; - MemoryManagement::logTraces = OCLRT::captureCallStacks; - if (OCLRT::captureCallStacks) { + MemoryManagement::logTraces = NEO::captureCallStacks; + if (NEO::captureCallStacks) { MemoryManagement::detailedAllocationLoggingActive = true; } MemoryManagement::fastLeakDetectionEnabled = true; @@ -34,7 +34,7 @@ void MemoryLeakListener::OnTestEnd(const TestInfo &testInfo) { EXPECT_GT(MemoryManagement::fastEventsAllocatedCount, MemoryManagement::fastEventsDeallocatedCount); } MemoryManagement::fastLeaksDetectionMode = MemoryManagement::LeakDetectionMode::STANDARD; - } else if (OCLRT::captureCallStacks && (MemoryManagement::fastEventsAllocatedCount != MemoryManagement::fastEventsDeallocatedCount)) { + } else if (NEO::captureCallStacks && (MemoryManagement::fastEventsAllocatedCount != MemoryManagement::fastEventsDeallocatedCount)) { auto leak = MemoryManagementFixture::enumerateLeak(MemoryManagement::indexAllocation.load(), MemoryManagement::indexDeallocation.load(), true, true); if (leak != MemoryManagement::failingAllocation) { printf("\n %s ", printCallStack(MemoryManagement::eventsAllocated[leak]).c_str()); diff --git a/unit_tests/memory_leak_listener.h b/unit_tests/memory_leak_listener.h index 356f4ebca1..7fdd2c2c8e 100644 --- a/unit_tests/memory_leak_listener.h +++ b/unit_tests/memory_leak_listener.h @@ -8,7 +8,7 @@ #pragma once #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { // capture allocations call stacks to print them during memory leak in ULTs constexpr bool captureCallStacks = false; @@ -20,4 +20,4 @@ class MemoryLeakListener : public ::testing::EmptyTestEventListener { unsigned int numInitialBaseObjects; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/memory_manager/address_mapper_tests.cpp b/unit_tests/memory_manager/address_mapper_tests.cpp index 8ac68d9d10..08a807645b 100644 --- a/unit_tests/memory_manager/address_mapper_tests.cpp +++ b/unit_tests/memory_manager/address_mapper_tests.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; class AddressMapperFixture { public: diff --git a/unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp b/unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp index 573c61e2fa..300c97c691 100644 --- a/unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp +++ b/unit_tests/memory_manager/deferrable_allocation_deletion_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; struct DeferredDeleterPublic : DeferredDeleter { public: diff --git a/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp b/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp index 9bc4baafec..44b340e320 100644 --- a/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp +++ b/unit_tests/memory_manager/deferred_deleter_mt_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(DeferredDeleter, NonCopyable) { EXPECT_FALSE(std::is_move_constructible::value); diff --git a/unit_tests/memory_manager/gfx_partition_tests.cpp b/unit_tests/memory_manager/gfx_partition_tests.cpp index c4fa4d30da..806e0c2138 100644 --- a/unit_tests/memory_manager/gfx_partition_tests.cpp +++ b/unit_tests/memory_manager/gfx_partition_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; void testGfxPartition(uint64_t gpuAddressSpace) { MockGfxPartition gfxPartition; diff --git a/unit_tests/memory_manager/graphics_allocation_tests.cpp b/unit_tests/memory_manager/graphics_allocation_tests.cpp index a8dd62b52b..2cc4edb411 100644 --- a/unit_tests/memory_manager/graphics_allocation_tests.cpp +++ b/unit_tests/memory_manager/graphics_allocation_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(GraphicsAllocationTest, givenGraphicsAllocationWhenIsCreatedThenAllInspectionIdsAreSetToZero) { MockGraphicsAllocation graphicsAllocation(GraphicsAllocation::AllocationType::UNKNOWN, nullptr, 0u, 0u, maxOsContextCount, MemoryPool::MemoryNull, true); diff --git a/unit_tests/memory_manager/host_ptr_manager_tests.cpp b/unit_tests/memory_manager/host_ptr_manager_tests.cpp index 5cb4cde306..7e23314244 100644 --- a/unit_tests/memory_manager/host_ptr_manager_tests.cpp +++ b/unit_tests/memory_manager/host_ptr_manager_tests.cpp @@ -16,7 +16,7 @@ #include "unit_tests/mocks/mock_internal_allocation_storage.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; TEST(HostPtrManager, AlignedPointerAndAlignedSizeAskedForAllocationCountReturnsOne) { auto size = MemoryConstants::pageSize * 10; diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl index c3b5cc69ee..a33cf53e5c 100644 --- a/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl +++ b/unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(MemoryManagerTest, givenSetUseSytemMemoryWhenGraphicsAllocationInDevicePoolIsAllocatedThenNullptrIsReturned) { ExecutionEnvironment executionEnvironment; diff --git a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index 0349ad3f55..eca9ebc626 100644 --- a/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/unit_tests/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class MemoryManagerGetAlloctionDataTest : public testing::TestWithParam { public: void SetUp() override {} diff --git a/unit_tests/memory_manager/memory_manager_tests.cpp b/unit_tests/memory_manager/memory_manager_tests.cpp index 0192e425c9..ccdb64dc5a 100644 --- a/unit_tests/memory_manager/memory_manager_tests.cpp +++ b/unit_tests/memory_manager/memory_manager_tests.cpp @@ -42,7 +42,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; typedef Test MemoryAllocatorTest; diff --git a/unit_tests/memory_manager/page_table_tests.cpp b/unit_tests/memory_manager/page_table_tests.cpp index 5b8ecbf593..3773f216ae 100644 --- a/unit_tests/memory_manager/page_table_tests.cpp +++ b/unit_tests/memory_manager/page_table_tests.cpp @@ -18,7 +18,7 @@ #include -using namespace OCLRT; +using namespace NEO; static const bool is64Bit = (sizeof(void *) == 8); diff --git a/unit_tests/memory_manager/physical_address_allocator_tests.cpp b/unit_tests/memory_manager/physical_address_allocator_tests.cpp index b74b5bd917..f0121523a9 100644 --- a/unit_tests/memory_manager/physical_address_allocator_tests.cpp +++ b/unit_tests/memory_manager/physical_address_allocator_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(PhysicalAddressAllocator, givenPhysicalAddressesAllocatorWhenReservingFirstPageThenNonZeroAddressIsReturned) { MockPhysicalAddressAllocator allocator; diff --git a/unit_tests/memory_manager/surface_tests.cpp b/unit_tests/memory_manager/surface_tests.cpp index 4d6843905c..3d892b4b37 100644 --- a/unit_tests/memory_manager/surface_tests.cpp +++ b/unit_tests/memory_manager/surface_tests.cpp @@ -19,7 +19,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef ::testing::Types SurfaceTypes; diff --git a/unit_tests/memory_manager/svm_memory_manager_tests.cpp b/unit_tests/memory_manager/svm_memory_manager_tests.cpp index be42276917..fad67bd2f2 100644 --- a/unit_tests/memory_manager/svm_memory_manager_tests.cpp +++ b/unit_tests/memory_manager/svm_memory_manager_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct SVMMemoryAllocatorTest : ::testing::Test { SVMMemoryAllocatorTest() : memoryManager(false, false, executionEnvironment), svmManager(&memoryManager) {} diff --git a/unit_tests/mock_gdi/mock_gdi.cpp b/unit_tests/mock_gdi/mock_gdi.cpp index 69de3262a0..545268d6f6 100644 --- a/unit_tests/mock_gdi/mock_gdi.cpp +++ b/unit_tests/mock_gdi/mock_gdi.cpp @@ -27,11 +27,11 @@ BOOLEAN WINAPI DllMain(IN HINSTANCE hDllHandle, NTSTATUS __stdcall D3DKMTEscape(IN CONST D3DKMT_ESCAPE *pData) { static int PerfTicks = 0; - ((OCLRT::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.RetCode = OCLRT::GTDI_RET_OK; - ((OCLRT::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfTicks = ++PerfTicks; - ((OCLRT::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfTicks = PerfTicks; - ((OCLRT::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfFreq = 1; - ((OCLRT::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfFreq = 1; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.RetCode = NEO::GTDI_RET_OK; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfTicks = ++PerfTicks; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfTicks = PerfTicks; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.gpuPerfFreq = 1; + ((NEO::TimeStampDataHeader *)pData->pPrivateDriverData)->m_Data.m_Out.cpuPerfFreq = 1; return STATUS_SUCCESS; } diff --git a/unit_tests/mocks/gl/mock_gl_arb_sync_event.h b/unit_tests/mocks/gl/mock_gl_arb_sync_event.h index 1cbd628432..b979129ccc 100644 --- a/unit_tests/mocks/gl/mock_gl_arb_sync_event.h +++ b/unit_tests/mocks/gl/mock_gl_arb_sync_event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,8 +10,8 @@ #include "runtime/sharings/gl/gl_arb_sync_event.h" template -struct DummyArbEvent : OCLRT::GlArbSyncEvent { - DummyArbEvent(OCLRT::Context &ctx) +struct DummyArbEvent : NEO::GlArbSyncEvent { + DummyArbEvent(NEO::Context &ctx) : GlArbSyncEvent(ctx) { } @@ -38,13 +38,13 @@ struct DummyArbEvent : OCLRT::GlArbSyncEvent { } }; -inline void glArbSyncObjectCleanupMockDoNothing(OCLRT::OSInterface &osInterface, CL_GL_SYNC_INFO *glSyncInfo) { +inline void glArbSyncObjectCleanupMockDoNothing(NEO::OSInterface &osInterface, CL_GL_SYNC_INFO *glSyncInfo) { } -inline void glArbSyncObjectSignalMockDoNothing(OCLRT::OsContext &osContext, CL_GL_SYNC_INFO &glSyncInfo) { +inline void glArbSyncObjectSignalMockDoNothing(NEO::OsContext &osContext, CL_GL_SYNC_INFO &glSyncInfo) { } template -inline bool mockGlArbSyncObjectSetup(OCLRT::GLSharingFunctions &sharing, OCLRT::OSInterface &osInterface, CL_GL_SYNC_INFO &glSyncInfo) { +inline bool mockGlArbSyncObjectSetup(NEO::GLSharingFunctions &sharing, NEO::OSInterface &osInterface, CL_GL_SYNC_INFO &glSyncInfo) { return (Fail == false); } diff --git a/unit_tests/mocks/gl/mock_gl_sharing.cpp b/unit_tests/mocks/gl/mock_gl_sharing.cpp index d3896cf789..5e7efa1d8d 100644 --- a/unit_tests/mocks/gl/mock_gl_sharing.cpp +++ b/unit_tests/mocks/gl/mock_gl_sharing.cpp @@ -9,7 +9,7 @@ #include "config.h" -namespace OCLRT { +namespace NEO { int EGLCreateContextCalled = 0; int EGLChooseConfigCalled = 0; int EGLDeleteContextCalled = 0; @@ -47,4 +47,4 @@ GlSharingFunctionsMock::GlSharingFunctionsMock() { MockGlSharing::MockGlSharing(GLType glhdcType, GLContext glhglrcHandle, GLContext glhglrcHandleBkpCtx, GLDisplay glhdcHandle) { sharingFunctions->setHandles(glhdcType, glhglrcHandle, glhglrcHandleBkpCtx, glhdcHandle); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/gl/mock_gl_sharing.h b/unit_tests/mocks/gl/mock_gl_sharing.h index beb8434c75..0c6af00b06 100644 --- a/unit_tests/mocks/gl/mock_gl_sharing.h +++ b/unit_tests/mocks/gl/mock_gl_sharing.h @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { struct EGLBkpContextParams { int32_t configAttrs; int32_t contextAttrs[3]; @@ -192,4 +192,4 @@ class MockGLSharingFunctions : public GLSharingFunctions { MockGLSharingFunctions::SharingEnabled = 1; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/gl/mock_opengl32.cpp b/unit_tests/mocks/gl/mock_opengl32.cpp index c185d0b1fa..426499024e 100644 --- a/unit_tests/mocks/gl/mock_opengl32.cpp +++ b/unit_tests/mocks/gl/mock_opengl32.cpp @@ -38,7 +38,7 @@ CL_GL_BUFFER_INFO bufferInfoInput = {0}; CL_GL_BUFFER_INFO bufferInfoOutput = {0}; CL_GL_RESOURCE_INFO textureInfoInput = {0}; CL_GL_RESOURCE_INFO textureInfoOutput = {0}; -OCLRT::GLMockReturnedValues glMockReturnedValues = {0}; +NEO::GLMockReturnedValues glMockReturnedValues = {0}; GLboolean GLSetSharedOCLContextStateReturnedValue = 1u; const unsigned char *WINAPI glGetString(unsigned int name) { @@ -50,8 +50,8 @@ const unsigned char *WINAPI glGetString(unsigned int name) { }; GLboolean WINAPI wglSetSharedOCLContextStateINTELMock(HDC HDCHandle, HGLRC ContextHandle, unsigned char State, void *pContextInfo) { - ((OCLRT::ContextInfo *)pContextInfo)->ContextHandle = 1; - ((OCLRT::ContextInfo *)pContextInfo)->DeviceHandle = 2; + ((NEO::ContextInfo *)pContextInfo)->ContextHandle = 1; + ((NEO::ContextInfo *)pContextInfo)->DeviceHandle = 2; return GLSetSharedOCLContextStateReturnedValue; }; GLboolean WINAPI mockGLAcquireSharedBuffer(GLDisplay, GLContext, GLContext, GLvoid *pResourceInfo) { @@ -178,7 +178,7 @@ BOOL WINAPI wglDeleteContext(HGLRC Arg1) { GLDeleteContextCalled++; return (GLboolean)1; }; -void WINAPI glGetIntegerv(GLenum pname, GLint *params) { return OCLRT::MockGLSharingFunctions::glGetIntegervTest(pname, params); }; +void WINAPI glGetIntegerv(GLenum pname, GLint *params) { return NEO::MockGLSharingFunctions::glGetIntegervTest(pname, params); }; BOOL WINAPI wglShareLists(HGLRC arg1, HGLRC arg2) { WGLShareListsCalled++; return 1; @@ -331,8 +331,8 @@ void memParam() { }; void loadBuffer(CL_GL_BUFFER_INFO buff) { bufferInfoOutput = buff; }; void loadTexture(CL_GL_RESOURCE_INFO texture) { textureInfoOutput = texture; }; -OCLRT::GLMockReturnedValues getGlMockReturnedValues() { return glMockReturnedValues; }; -void setGlMockReturnedValues(OCLRT::GLMockReturnedValues value) { glMockReturnedValues = value; }; +NEO::GLMockReturnedValues getGlMockReturnedValues() { return glMockReturnedValues; }; +void setGlMockReturnedValues(NEO::GLMockReturnedValues value) { glMockReturnedValues = value; }; void setGetSyncivReturnValue(int val) { glMockReturnedValues.syncivRetVal = val; } void glSetString(const char *name, unsigned int var) { if (var == GL_VENDOR) { diff --git a/unit_tests/mocks/gmm_memory/mock_gmm_memory.h b/unit_tests/mocks/gmm_memory/mock_gmm_memory.h index 106070e0ab..b54e07f062 100644 --- a/unit_tests/mocks/gmm_memory/mock_gmm_memory.h +++ b/unit_tests/mocks/gmm_memory/mock_gmm_memory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,11 +8,11 @@ #pragma once #include "unit_tests/mocks/mock_gmm_memory_base.h" -namespace OCLRT { +namespace NEO { class MockGmmMemory : public MockGmmMemoryBase { }; class GmockGmmMemory : public GmockGmmMemoryBase { }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/linux/mock_drm_allocation.h b/unit_tests/mocks/linux/mock_drm_allocation.h index 93353a1f0e..01625076e9 100644 --- a/unit_tests/mocks/linux/mock_drm_allocation.h +++ b/unit_tests/mocks/linux/mock_drm_allocation.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/linux/drm_allocation.h" #include "runtime/os_interface/linux/drm_buffer_object.h" -namespace OCLRT { +namespace NEO { class MockBufferObject : public BufferObject { public: @@ -28,4 +28,4 @@ class MockDrmAllocation : public DrmAllocation { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/linux/mock_drm_memory_manager.h b/unit_tests/mocks/linux/mock_drm_memory_manager.h index 1e9c117c84..7890e4b7a0 100644 --- a/unit_tests/mocks/linux/mock_drm_memory_manager.h +++ b/unit_tests/mocks/linux/mock_drm_memory_manager.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { static off_t lseekReturn = 4096u; static std::atomic lseekCalledCount(0); static std::atomic mmapMockCallCount(0); @@ -111,4 +111,4 @@ class TestedDrmMemoryManager : public MemoryManagerCreate { return allocate32BitGraphicsMemoryImpl(allocationData); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_32bitAllocator.h b/unit_tests/mocks/mock_32bitAllocator.h index 1768d5ddb0..b32d5c15aa 100644 --- a/unit_tests/mocks/mock_32bitAllocator.h +++ b/unit_tests/mocks/mock_32bitAllocator.h @@ -11,7 +11,7 @@ #include "runtime/os_interface/linux/drm_32bit_memory.cpp" #include -namespace OCLRT { +namespace NEO { constexpr uintptr_t startOf32MmapRegion = 0x40000000; static bool failMmap = false; @@ -78,4 +78,4 @@ class MockAllocator32Bit : public Allocator32bit { OsInternals *getOsInternals() const { return this->osInternals.get(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_allocation_properties.h b/unit_tests/mocks/mock_allocation_properties.h index 43d9493397..439815212d 100644 --- a/unit_tests/mocks/mock_allocation_properties.h +++ b/unit_tests/mocks/mock_allocation_properties.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/memory_manager.h" -namespace OCLRT { +namespace NEO { struct MockAllocationProperties : public AllocationProperties { public: MockAllocationProperties(size_t size, GraphicsAllocation::AllocationType allocationType) : AllocationProperties(size, allocationType) {} @@ -16,4 +16,4 @@ struct MockAllocationProperties : public AllocationProperties { MockAllocationProperties(bool allocateMemory, size_t size) : AllocationProperties(allocateMemory, size, GraphicsAllocation::AllocationType::UNDECIDED) {} MockAllocationProperties(bool allocateMemory, size_t size, GraphicsAllocation::AllocationType allocationType) : AllocationProperties(allocateMemory, size, allocationType) {} }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_async_event_handler.h b/unit_tests/mocks/mock_async_event_handler.h index 4aa6d0651f..f7eef32cfe 100644 --- a/unit_tests/mocks/mock_async_event_handler.h +++ b/unit_tests/mocks/mock_async_event_handler.h @@ -15,7 +15,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; namespace MockAsyncEventHandlerGlobals { extern bool destructorCalled; } diff --git a/unit_tests/mocks/mock_aub_center.h b/unit_tests/mocks/mock_aub_center.h index 59c7807303..04190bace0 100644 --- a/unit_tests/mocks/mock_aub_center.h +++ b/unit_tests/mocks/mock_aub_center.h @@ -7,7 +7,7 @@ #include "runtime/aub/aub_center.h" -class MockAubCenter : public OCLRT::AubCenter { +class MockAubCenter : public NEO::AubCenter { public: using AubCenter::AubCenter; using AubCenter::aubManager; diff --git a/unit_tests/mocks/mock_aub_csr.h b/unit_tests/mocks/mock_aub_csr.h index 905bd7cbb5..bbd143d766 100644 --- a/unit_tests/mocks/mock_aub_csr.h +++ b/unit_tests/mocks/mock_aub_csr.h @@ -22,7 +22,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -namespace OCLRT { +namespace NEO { struct MockAubFileStreamMockMmioWrite : public AubMemDump::AubFileStream { void writeMMIOImpl(uint32_t offset, uint32_t value) override { @@ -185,7 +185,7 @@ std::unique_ptr getEnvironment(bool createTagAllocation aubExecutionEnvironment->executionEnvironment = std::move(executionEnvironment); return aubExecutionEnvironment; } -} // namespace OCLRT +} // namespace NEO #if defined(__clang__) #pragma clang diagnostic pop diff --git a/unit_tests/mocks/mock_aub_file_stream.h b/unit_tests/mocks/mock_aub_file_stream.h index e31b7a7291..6ef6d39c8b 100644 --- a/unit_tests/mocks/mock_aub_file_stream.h +++ b/unit_tests/mocks/mock_aub_file_stream.h @@ -16,7 +16,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -namespace OCLRT { +namespace NEO { struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { bool init(uint32_t stepping, uint32_t device) override { @@ -82,7 +82,7 @@ struct MockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { struct GmockAubFileStream : public AUBCommandStreamReceiver::AubFileStream { MOCK_METHOD1(addComment, bool(const char *message)); }; -} // namespace OCLRT +} // namespace NEO #if defined(__clang__) #pragma clang diagnostic pop diff --git a/unit_tests/mocks/mock_aub_stream.h b/unit_tests/mocks/mock_aub_stream.h index c6c691c8b1..4d2254c3f1 100644 --- a/unit_tests/mocks/mock_aub_stream.h +++ b/unit_tests/mocks/mock_aub_stream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/gen_common/aub_mapper_base.h" -namespace OCLRT { +namespace NEO { struct MockAubStreamMockMmioWrite : AubMemDump::AubStream { void open(const char *filePath) override{}; @@ -38,4 +38,4 @@ struct MockAubStreamMockMmioWrite : AubMemDump::AubStream { std::vector> mmioList; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_aub_subcapture_manager.h b/unit_tests/mocks/mock_aub_subcapture_manager.h index 637e9c03b1..0af60b1c81 100644 --- a/unit_tests/mocks/mock_aub_subcapture_manager.h +++ b/unit_tests/mocks/mock_aub_subcapture_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_stream/aub_subcapture.h" -using namespace OCLRT; +using namespace NEO; class AubSubCaptureManagerMock : public AubSubCaptureManager { public: diff --git a/unit_tests/mocks/mock_block_kernel_manager.h b/unit_tests/mocks/mock_block_kernel_manager.h index 5142311a36..2650e7e4cf 100644 --- a/unit_tests/mocks/mock_block_kernel_manager.h +++ b/unit_tests/mocks/mock_block_kernel_manager.h @@ -1,29 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "runtime/program/block_kernel_manager.h" -namespace OCLRT { +namespace NEO { class MockBlockKernelManager : public BlockKernelManager { public: @@ -32,4 +17,4 @@ class MockBlockKernelManager : public BlockKernelManager { using BlockKernelManager::blockKernelInfoArray; using BlockKernelManager::blockPrivateSurfaceArray; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_buffer.h b/unit_tests/mocks/mock_buffer.h index 9834f867bd..b8fa51da4e 100644 --- a/unit_tests/mocks/mock_buffer.h +++ b/unit_tests/mocks/mock_buffer.h @@ -12,7 +12,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -using namespace OCLRT; +using namespace NEO; class MockBufferStorage { public: diff --git a/unit_tests/mocks/mock_builtin_dispatch_info_builder.h b/unit_tests/mocks/mock_builtin_dispatch_info_builder.h index 52cce984d9..45c9230fe9 100644 --- a/unit_tests/mocks/mock_builtin_dispatch_info_builder.h +++ b/unit_tests/mocks/mock_builtin_dispatch_info_builder.h @@ -1,30 +1,15 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once #include "runtime/built_ins/built_ins.h" #include "runtime/helpers/dispatch_info.h" -using namespace OCLRT; +using namespace NEO; class MockBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder { public: diff --git a/unit_tests/mocks/mock_builtins.h b/unit_tests/mocks/mock_builtins.h index 6eef1b068b..320a101f96 100644 --- a/unit_tests/mocks/mock_builtins.h +++ b/unit_tests/mocks/mock_builtins.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -13,9 +13,9 @@ #include -class MockBuiltins : public OCLRT::BuiltIns { +class MockBuiltins : public NEO::BuiltIns { public: - const OCLRT::SipKernel &getSipKernel(OCLRT::SipKernelType type, OCLRT::Device &device) override { + const NEO::SipKernel &getSipKernel(NEO::SipKernelType type, NEO::Device &device) override { if (sipKernelsOverride.find(type) != sipKernelsOverride.end()) { return *sipKernelsOverride[type]; } @@ -24,12 +24,12 @@ class MockBuiltins : public OCLRT::BuiltIns { return BuiltIns::getSipKernel(type, device); } - void overrideSipKernel(std::unique_ptr kernel) { + void overrideSipKernel(std::unique_ptr kernel) { sipKernelsOverride[kernel->getType()] = std::move(kernel); } - OCLRT::BuiltIns *originalGlobalBuiltins = nullptr; - std::map> sipKernelsOverride; + NEO::BuiltIns *originalGlobalBuiltins = nullptr; + std::map> sipKernelsOverride; bool getSipKernelCalled = false; - OCLRT::SipKernelType getSipKernelType = OCLRT::SipKernelType::COUNT; + NEO::SipKernelType getSipKernelType = NEO::SipKernelType::COUNT; }; diff --git a/unit_tests/mocks/mock_cif.cpp b/unit_tests/mocks/mock_cif.cpp index 8dded4036e..e685cd9d2a 100644 --- a/unit_tests/mocks/mock_cif.cpp +++ b/unit_tests/mocks/mock_cif.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "cif/builtins/memory/buffer/buffer.h" #include "cif/export/library_api.h" -namespace OCLRT { +namespace NEO { bool failCreateCifMain = false; } @@ -84,7 +84,7 @@ bool BufferSimple::IsConst() const { } // namespace Builtins } // namespace CIF -namespace OCLRT { +namespace NEO { std::map MockCIFMain::globalCreators; @@ -120,12 +120,12 @@ CIF::ICIF *MockCIFMain::CreateInterfaceImpl(CIF::InterfaceId_t intId, CIF::Versi return it->second(intId, version); } -} // namespace OCLRT +} // namespace NEO extern CIF::CIFMain *CreateCIFMainImpl() { - if (OCLRT::failCreateCifMain) { + if (NEO::failCreateCifMain) { return nullptr; } - return new OCLRT::MockCIFMain; + return new NEO::MockCIFMain; } diff --git a/unit_tests/mocks/mock_cif.h b/unit_tests/mocks/mock_cif.h index f75957d97a..66e326c0a2 100644 --- a/unit_tests/mocks/mock_cif.h +++ b/unit_tests/mocks/mock_cif.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { extern bool failCreateCifMain; @@ -212,4 +212,4 @@ struct MockCIFBuffer : MockCIF { std::vector data; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_command_queue.h b/unit_tests/mocks/mock_command_queue.h index 862d10b676..4785966f73 100644 --- a/unit_tests/mocks/mock_command_queue.h +++ b/unit_tests/mocks/mock_command_queue.h @@ -13,7 +13,7 @@ // MockCommandQueue - Core implementation //////////////////////////////////////////////////////////////////////////////// -namespace OCLRT { +namespace NEO { class MockCommandQueue : public CommandQueue { public: using CommandQueue::device; @@ -153,4 +153,4 @@ class MockCommandQueueHw : public CommandQueueHw { completionStampTaskCount = referenceToCompletionStampTaskCount; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_compilers.cpp b/unit_tests/mocks/mock_compilers.cpp index 0954b68708..dc86440472 100644 --- a/unit_tests/mocks/mock_compilers.cpp +++ b/unit_tests/mocks/mock_compilers.cpp @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { std::unique_ptr fclDebugVars; std::unique_ptr igcDebugVars; @@ -71,8 +71,8 @@ void MockCompilerEnableGuard::Enable() { this->oldIgcDllName = Os::igcDllName; Os::frontEndDllName = ""; Os::igcDllName = ""; - MockCIFMain::setGlobalCreatorFunc(OCLRT::MockIgcOclDeviceCtx::Create); - MockCIFMain::setGlobalCreatorFunc(OCLRT::MockFclOclDeviceCtx::Create); + MockCIFMain::setGlobalCreatorFunc(NEO::MockIgcOclDeviceCtx::Create); + MockCIFMain::setGlobalCreatorFunc(NEO::MockFclOclDeviceCtx::Create); if (fclDebugVars == nullptr) { fclDebugVars.reset(new MockCompilerDebugVars); } @@ -89,8 +89,8 @@ void MockCompilerEnableGuard::Disable() { Os::frontEndDllName = this->oldFclDllName; Os::igcDllName = this->oldIgcDllName; - MockCIFMain::removeGlobalCreatorFunc(); - MockCIFMain::removeGlobalCreatorFunc(); + MockCIFMain::removeGlobalCreatorFunc(); + MockCIFMain::removeGlobalCreatorFunc(); clearFclDebugVars(); clearIgcDebugVars(); @@ -98,7 +98,7 @@ void MockCompilerEnableGuard::Disable() { enabled = false; } } -} // namespace OCLRT +} // namespace NEO namespace IGC { @@ -319,7 +319,7 @@ CodeType::CodeType_t CIF_GET_INTERFACE_CLASS(FclOclDeviceCtx, 2)::GetPreferredIn #include "cif/macros/disable.h" -namespace OCLRT { +namespace NEO { template std::unique_ptr loadBinaryFile(StrT &&fileName, size_t &fileSize) { @@ -340,7 +340,7 @@ std::unique_ptr loadBinaryFile(StrT &&fileName, size_t &fileSiz void translate(bool usingIgc, CIF::Builtins::BufferSimple *src, CIF::Builtins::BufferSimple *options, CIF::Builtins::BufferSimple *internalOptions, MockOclTranslationOutput *out) { - MockCompilerDebugVars &debugVars = (usingIgc) ? *OCLRT::igcDebugVars : *fclDebugVars; + MockCompilerDebugVars &debugVars = (usingIgc) ? *NEO::igcDebugVars : *fclDebugVars; if (debugVars.receivedInput != nullptr) { if (src != nullptr) { debugVars.receivedInput->assign(src->GetMemory(), @@ -549,4 +549,4 @@ IGC::FclOclTranslationCtxBase *MockFclOclDeviceCtx::CreateTranslationCtxImpl(CIF std::vector MockCompilerInterface::getDummyGenBinary() { return MockSipKernel::getDummyGenBinary(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_compilers.h b/unit_tests/mocks/mock_compilers.h index 0e0ebf7cb4..4de42d12de 100644 --- a/unit_tests/mocks/mock_compilers.h +++ b/unit_tests/mocks/mock_compilers.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -18,7 +18,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct MockCompilerDebugVars { bool forceBuildFailure = false; @@ -360,4 +360,4 @@ template <> inline std::map &MockCompilerInterface::getDeviceContexts() { return getFclDeviceContexts(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_context.cpp b/unit_tests/mocks/mock_context.cpp index f51ee01ff3..ecfe8c02d6 100644 --- a/unit_tests/mocks/mock_context.cpp +++ b/unit_tests/mocks/mock_context.cpp @@ -18,7 +18,7 @@ #include "d3d_sharing_functions.h" -namespace OCLRT { +namespace NEO { MockContext::MockContext(Device *device, bool noSpecialQueue) { memoryManager = device->getMemoryManager(); @@ -95,4 +95,4 @@ void MockContext::clearSharingFunctions() { std::vectorsharingFunctions)::value_type> v; this->sharingFunctions.swap(v); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_context.h b/unit_tests/mocks/mock_context.h index cad64f883b..bc0626578d 100644 --- a/unit_tests/mocks/mock_context.h +++ b/unit_tests/mocks/mock_context.h @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class MockContext : public Context { public: using Context::sharingFunctions; @@ -42,4 +42,4 @@ class MockContext : public Context { private: Device *device; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h index 52e609a736..720cef9f99 100644 --- a/unit_tests/mocks/mock_csr.h +++ b/unit_tests/mocks/mock_csr.h @@ -27,7 +27,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -using namespace OCLRT; +using namespace NEO; template class MockCsrBase : public UltCommandStreamReceiver { diff --git a/unit_tests/mocks/mock_d3d_objects.h b/unit_tests/mocks/mock_d3d_objects.h index 9a9b06a0eb..cfccc3ae32 100644 --- a/unit_tests/mocks/mock_d3d_objects.h +++ b/unit_tests/mocks/mock_d3d_objects.h @@ -13,7 +13,7 @@ using ::testing::_; using ::testing::NiceMock; using ::testing::SetArgPointee; -namespace OCLRT { +namespace NEO { template class MockD3DSharingFunctions : public D3DSharingFunctions { typedef typename D3D::D3DDevice D3DDevice; @@ -75,4 +75,4 @@ class MockD3DSharingFunctions : public D3DSharingFunctions { *dxgiDesc = mockDxgiDesc; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_deferrable_deletion.cpp b/unit_tests/mocks/mock_deferrable_deletion.cpp index 5ddcca5480..051d0914bf 100644 --- a/unit_tests/mocks/mock_deferrable_deletion.cpp +++ b/unit_tests/mocks/mock_deferrable_deletion.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_deferrable_deletion.h" -namespace OCLRT { +namespace NEO { bool MockDeferrableDeletion::apply() { applyCalled++; return true; @@ -15,4 +15,4 @@ bool MockDeferrableDeletion::apply() { MockDeferrableDeletion::~MockDeferrableDeletion() { EXPECT_EQ(1, applyCalled); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/mocks/mock_deferrable_deletion.h b/unit_tests/mocks/mock_deferrable_deletion.h index 7340cde2a9..687feb93dd 100644 --- a/unit_tests/mocks/mock_deferrable_deletion.h +++ b/unit_tests/mocks/mock_deferrable_deletion.h @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class MockDeferrableDeletion : public DeferrableDeletion { public: bool apply() override; @@ -18,4 +18,4 @@ class MockDeferrableDeletion : public DeferrableDeletion { virtual ~MockDeferrableDeletion(); int applyCalled = 0; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/mocks/mock_deferred_deleter.cpp b/unit_tests/mocks/mock_deferred_deleter.cpp index b490e63451..399766cb53 100644 --- a/unit_tests/mocks/mock_deferred_deleter.cpp +++ b/unit_tests/mocks/mock_deferred_deleter.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { MockDeferredDeleter::MockDeferredDeleter() { shouldStopCalled = 0; @@ -129,4 +129,4 @@ void MockDeferredDeleter::expectDrainBlockingValue(bool value) { expectedDrainValue = value; expectDrainCalled = true; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_deferred_deleter.h b/unit_tests/mocks/mock_deferred_deleter.h index b15187673f..84962fc83d 100644 --- a/unit_tests/mocks/mock_deferred_deleter.h +++ b/unit_tests/mocks/mock_deferred_deleter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/deferred_deleter.h" -namespace OCLRT { +namespace NEO { class MockDeferredDeleter : public DeferredDeleter { public: MockDeferredDeleter(); @@ -73,4 +73,4 @@ class MockDeferredDeleter : public DeferredDeleter { void clearQueue() override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_device.cpp b/unit_tests/mocks/mock_device.cpp index 9aef8d55d7..0b8ebe35c6 100644 --- a/unit_tests/mocks/mock_device.cpp +++ b/unit_tests/mocks/mock_device.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_ostime.h" #include "unit_tests/tests_configuration.h" -using namespace OCLRT; +using namespace NEO; MockDevice::MockDevice(const HardwareInfo &hwInfo) : MockDevice(hwInfo, new MockExecutionEnvironment(&hwInfo), 0u) { diff --git a/unit_tests/mocks/mock_device.h b/unit_tests/mocks/mock_device.h index af7c4c8b9f..abc13eace8 100644 --- a/unit_tests/mocks/mock_device.h +++ b/unit_tests/mocks/mock_device.h @@ -11,7 +11,7 @@ #include "unit_tests/libult/ult_command_stream_receiver.h" #include "unit_tests/mocks/mock_allocation_properties.h" -namespace OCLRT { +namespace NEO { class OSTime; class FailMemoryManager; @@ -139,4 +139,4 @@ class MockAlignedMallocManagerDevice : public MockDevice { public: MockAlignedMallocManagerDevice(const HardwareInfo &hwInfo, ExecutionEnvironment *executionEnvironment, uint32_t deviceIndex); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_device_factory.h b/unit_tests/mocks/mock_device_factory.h index 122cc59ee0..62bb4703f2 100644 --- a/unit_tests/mocks/mock_device_factory.h +++ b/unit_tests/mocks/mock_device_factory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #pragma once #include "runtime/os_interface/device_factory.h" -namespace OCLRT { +namespace NEO { class MockDeviceFactory : public DeviceFactory { public: size_t getNumDevices() { return numDevices; }; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_device_queue.h b/unit_tests/mocks/mock_device_queue.h index de277851a3..34d5322618 100644 --- a/unit_tests/mocks/mock_device_queue.h +++ b/unit_tests/mocks/mock_device_queue.h @@ -9,7 +9,7 @@ #include "runtime/device_queue/device_queue.h" #include "runtime/device_queue/device_queue_hw.h" -namespace OCLRT { +namespace NEO { template class MockDeviceQueueHw : public DeviceQueueHw { using BaseClass = DeviceQueueHw; @@ -174,4 +174,4 @@ class MockDeviceQueueHw : public DeviceQueueHw { return igilCmdQueue; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_event.h b/unit_tests/mocks/mock_event.h index e7debf3b63..60284740ec 100644 --- a/unit_tests/mocks/mock_event.h +++ b/unit_tests/mocks/mock_event.h @@ -10,7 +10,7 @@ #include "runtime/event/event_builder.h" #include "runtime/event/user_event.h" -namespace OCLRT { +namespace NEO { #define FORWARD_CONSTRUCTOR(THIS_CLASS, BASE_CLASS) \ template \ @@ -58,4 +58,4 @@ struct MockEventBuilder : EventBuilder { return static_cast(mb.finalizeAndRelease()); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_execution_environment.h b/unit_tests/mocks/mock_execution_environment.h index c076d86ea2..93ef1cb409 100644 --- a/unit_tests/mocks/mock_execution_environment.h +++ b/unit_tests/mocks/mock_execution_environment.h @@ -10,7 +10,7 @@ #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/options.h" -namespace OCLRT { +namespace NEO { struct MockExecutionEnvironment : ExecutionEnvironment { MockExecutionEnvironment() = default; MockExecutionEnvironment(const HardwareInfo *hwInfo) { @@ -28,4 +28,4 @@ struct MockExecutionEnvironment : ExecutionEnvironment { bool localMemoryEnabledReceived = false; std::string aubFileNameReceived = ""; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_experimental_command_buffer.h b/unit_tests/mocks/mock_experimental_command_buffer.h index 34656acdf3..1b8808b460 100644 --- a/unit_tests/mocks/mock_experimental_command_buffer.h +++ b/unit_tests/mocks/mock_experimental_command_buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/command_stream/experimental_command_buffer.h" -namespace OCLRT { +namespace NEO { class MockExperimentalCommandBuffer : public ExperimentalCommandBuffer { using BaseClass = ExperimentalCommandBuffer; @@ -25,4 +25,4 @@ class MockExperimentalCommandBuffer : public ExperimentalCommandBuffer { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gfx_partition.cpp b/unit_tests/mocks/mock_gfx_partition.cpp index 0e8e3269a3..b732fe5098 100644 --- a/unit_tests/mocks/mock_gfx_partition.cpp +++ b/unit_tests/mocks/mock_gfx_partition.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_gfx_partition.h" -using namespace OCLRT; +using namespace NEO; std::array(HeapIndex::TOTAL_HEAPS)> MockGfxPartition::allHeapNames{{HeapIndex::HEAP_INTERNAL_DEVICE_MEMORY, diff --git a/unit_tests/mocks/mock_gfx_partition.h b/unit_tests/mocks/mock_gfx_partition.h index 76d52c9527..e62f0bd15d 100644 --- a/unit_tests/mocks/mock_gfx_partition.h +++ b/unit_tests/mocks/mock_gfx_partition.h @@ -7,7 +7,7 @@ #include "runtime/memory_manager/gfx_partition.h" -using namespace OCLRT; +using namespace NEO; class MockGfxPartition : public GfxPartition { public: diff --git a/unit_tests/mocks/mock_gmm.h b/unit_tests/mocks/mock_gmm.h index 2e75f1f628..bae1150922 100644 --- a/unit_tests/mocks/mock_gmm.h +++ b/unit_tests/mocks/mock_gmm.h @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_gmm_resource_info.h" -namespace OCLRT { +namespace NEO { namespace MockGmmParams { static SurfaceFormatInfo mockSurfaceFormat; } @@ -47,4 +47,4 @@ class MockGmm : public Gmm { return memoryManager.allocateGraphicsMemoryWithProperties(AllocationProperties{&imgInfo, true}); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_client_context.cpp b/unit_tests/mocks/mock_gmm_client_context.cpp index 39222e8d7d..7bca6d0582 100644 --- a/unit_tests/mocks/mock_gmm_client_context.cpp +++ b/unit_tests/mocks/mock_gmm_client_context.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "mock_gmm_client_context.h" -namespace OCLRT { +namespace NEO { MockGmmClientContext::MockGmmClientContext(GMM_CLIENT clientType, GmmExportEntries &gmmExportEntries) : MockGmmClientContextBase(clientType, gmmExportEntries) { } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_client_context.h b/unit_tests/mocks/mock_gmm_client_context.h index 7fe482b8aa..b9d41dc205 100644 --- a/unit_tests/mocks/mock_gmm_client_context.h +++ b/unit_tests/mocks/mock_gmm_client_context.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #pragma once #include "unit_tests/mocks/mock_gmm_client_context_base.h" -namespace OCLRT { +namespace NEO { class MockGmmClientContext : public MockGmmClientContextBase { public: MockGmmClientContext(GMM_CLIENT clientType, GmmExportEntries &gmmExportEntries); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_client_context_base.cpp b/unit_tests/mocks/mock_gmm_client_context_base.cpp index e3fbf839a6..acd4b700fd 100644 --- a/unit_tests/mocks/mock_gmm_client_context_base.cpp +++ b/unit_tests/mocks/mock_gmm_client_context_base.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_gmm_client_context.h" -namespace OCLRT { +namespace NEO { MockGmmClientContextBase::MockGmmClientContextBase(GMM_CLIENT clientType, GmmExportEntries &gmmExportEntries) : GmmClientContext(clientType, gmmExportEntries) { } @@ -42,4 +42,4 @@ GMM_RESOURCE_INFO *MockGmmClientContextBase::copyResInfoObject(GMM_RESOURCE_INFO void MockGmmClientContextBase::destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo) { delete[] reinterpret_cast(pResInfo); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_client_context_base.h b/unit_tests/mocks/mock_gmm_client_context_base.h index 9d0f77e7d4..203298d88d 100644 --- a/unit_tests/mocks/mock_gmm_client_context_base.h +++ b/unit_tests/mocks/mock_gmm_client_context_base.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "gmm_client_context.h" -namespace OCLRT { +namespace NEO { class MockGmmClientContextBase : public GmmClientContext { public: MEMORY_OBJECT_CONTROL_STATE cachePolicyGetMemoryObject(GMM_RESOURCE_INFO *pResInfo, GMM_RESOURCE_USAGE_TYPE usage) override; @@ -19,4 +19,4 @@ class MockGmmClientContextBase : public GmmClientContext { protected: MockGmmClientContextBase(GMM_CLIENT clientType, GmmExportEntries &gmmExportEntries); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_memory_base.cpp b/unit_tests/mocks/mock_gmm_memory_base.cpp index c87b15de6d..41ca54fb39 100644 --- a/unit_tests/mocks/mock_gmm_memory_base.cpp +++ b/unit_tests/mocks/mock_gmm_memory_base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "mock_gmm_memory.h" -namespace OCLRT { +namespace NEO { GmmMemory *GmmMemory::create() { return new MockGmmMemory(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_memory_base.h b/unit_tests/mocks/mock_gmm_memory_base.h index 8dbac7489c..de5f6ab15c 100644 --- a/unit_tests/mocks/mock_gmm_memory_base.h +++ b/unit_tests/mocks/mock_gmm_memory_base.h @@ -11,7 +11,7 @@ #include "gmm_memory.h" #include "gmock/gmock.h" -namespace OCLRT { +namespace NEO { class MockGmmMemoryBase : public GmmMemory { public: @@ -41,4 +41,4 @@ class GmockGmmMemoryBase : public GmmMemory { GMM_GFX_SIZE_T SvmSize, BOOLEAN BDWL3Coherency)); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_page_table_mngr.cpp b/unit_tests/mocks/mock_gmm_page_table_mngr.cpp index eb891b0977..9851973fc7 100644 --- a/unit_tests/mocks/mock_gmm_page_table_mngr.cpp +++ b/unit_tests/mocks/mock_gmm_page_table_mngr.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_gmm_page_table_mngr.h" -namespace OCLRT { +namespace NEO { using namespace ::testing; GmmPageTableMngr *GmmPageTableMngr::create(GMM_DEVICE_CALLBACKS_INT *deviceCb, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) { @@ -17,4 +17,4 @@ GmmPageTableMngr *GmmPageTableMngr::create(GMM_DEVICE_CALLBACKS_INT *deviceCb, u ON_CALL(*pageTableMngr, updateAuxTable(_)).WillByDefault(Return(GMM_SUCCESS)); return pageTableMngr; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_page_table_mngr.h b/unit_tests/mocks/mock_gmm_page_table_mngr.h index 6b7830b00e..0d3be0534f 100644 --- a/unit_tests/mocks/mock_gmm_page_table_mngr.h +++ b/unit_tests/mocks/mock_gmm_page_table_mngr.h @@ -11,7 +11,7 @@ #include "gmock/gmock.h" -namespace OCLRT { +namespace NEO { class MockGmmPageTableMngr : public GmmPageTableMngr { public: MockGmmPageTableMngr() = default; @@ -30,4 +30,4 @@ class MockGmmPageTableMngr : public GmmPageTableMngr { unsigned int translationTableFlags = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_resource_info.cpp b/unit_tests/mocks/mock_gmm_resource_info.cpp index 00e4fe1898..373dee7394 100644 --- a/unit_tests/mocks/mock_gmm_resource_info.cpp +++ b/unit_tests/mocks/mock_gmm_resource_info.cpp @@ -12,7 +12,7 @@ using namespace ::testing; -namespace OCLRT { +namespace NEO { GmmResourceInfo *GmmResourceInfo::create(GMM_RESCREATE_PARAMS *resourceCreateParams) { return new ::testing::NiceMock(resourceCreateParams); } @@ -138,4 +138,4 @@ uint32_t MockGmmResourceInfo::getTileModeSurfaceState() { MockGmmResourceInfo::MockGmmResourceInfo() {} MockGmmResourceInfo::~MockGmmResourceInfo() {} -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_gmm_resource_info.h b/unit_tests/mocks/mock_gmm_resource_info.h index 122c37e2c5..a64787d3ea 100644 --- a/unit_tests/mocks/mock_gmm_resource_info.h +++ b/unit_tests/mocks/mock_gmm_resource_info.h @@ -16,7 +16,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -namespace OCLRT { +namespace NEO { struct SurfaceFormatInfo; class MockGmmResourceInfo : public GmmResourceInfo { @@ -108,7 +108,7 @@ class MockGmmResourceInfo : public GmmResourceInfo { uint32_t unifiedAuxPitch = 0; uint32_t auxQPitch = 0; }; -} // namespace OCLRT +} // namespace NEO #if defined(__clang__) #pragma clang diagnostic pop diff --git a/unit_tests/mocks/mock_graphics_allocation.h b/unit_tests/mocks/mock_graphics_allocation.h index eba0415dd4..6b2bf81858 100644 --- a/unit_tests/mocks/mock_graphics_allocation.h +++ b/unit_tests/mocks/mock_graphics_allocation.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/graphics_allocation.h" -namespace OCLRT { +namespace NEO { class MockGraphicsAllocation : public GraphicsAllocation { public: using GraphicsAllocation::GraphicsAllocation; @@ -38,4 +38,4 @@ class MockGraphicsAllocation : public GraphicsAllocation { this->memoryPool = pool; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_host_ptr_manager.h b/unit_tests/mocks/mock_host_ptr_manager.h index 0f5c925049..d3e3d588c6 100644 --- a/unit_tests/mocks/mock_host_ptr_manager.h +++ b/unit_tests/mocks/mock_host_ptr_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/host_ptr_manager.h" -namespace OCLRT { +namespace NEO { class MockHostPtrManager : public HostPtrManager { public: using HostPtrManager::checkAllocationsForOverlapping; @@ -17,4 +17,4 @@ class MockHostPtrManager : public HostPtrManager { using HostPtrManager::populateAlreadyAllocatedFragments; size_t getFragmentCount() { return partialAllocations.size(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_image.h b/unit_tests/mocks/mock_image.h index 88dd25c423..30822e7aec 100644 --- a/unit_tests/mocks/mock_image.h +++ b/unit_tests/mocks/mock_image.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,20 +10,20 @@ #include "runtime/mem_obj/image.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -struct MockImageBase : public OCLRT::Image { +struct MockImageBase : public NEO::Image { using Image::graphicsAllocation; using Image::imageDesc; MockImageBase() : Image(nullptr, cl_mem_flags{}, 0, nullptr, cl_image_format{}, - cl_image_desc{}, false, new OCLRT::MockGraphicsAllocation(nullptr, 0), false, false, - 0, 0, OCLRT::SurfaceFormatInfo{}, nullptr) { + cl_image_desc{}, false, new NEO::MockGraphicsAllocation(nullptr, 0), false, false, + 0, 0, NEO::SurfaceFormatInfo{}, nullptr) { } ~MockImageBase() override { delete this->graphicsAllocation; } - OCLRT::MockGraphicsAllocation *getAllocation() { - return static_cast(graphicsAllocation); + NEO::MockGraphicsAllocation *getAllocation() { + return static_cast(graphicsAllocation); } void setImageArg(void *memory, bool isMediaBlockImage, uint32_t mipLevel) override {} diff --git a/unit_tests/mocks/mock_instrumentation.cpp b/unit_tests/mocks/mock_instrumentation.cpp index b04f3274bd..f12be71547 100644 --- a/unit_tests/mocks/mock_instrumentation.cpp +++ b/unit_tests/mocks/mock_instrumentation.cpp @@ -9,7 +9,7 @@ #include -using namespace OCLRT; +using namespace NEO; bool InstrAutoSamplingStart( InstrEscCbData cbData, diff --git a/unit_tests/mocks/mock_internal_allocation_storage.h b/unit_tests/mocks/mock_internal_allocation_storage.h index 4707407ab8..cc93c36281 100644 --- a/unit_tests/mocks/mock_internal_allocation_storage.h +++ b/unit_tests/mocks/mock_internal_allocation_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/memory_manager/internal_allocation_storage.h" -namespace OCLRT { +namespace NEO { class MockInternalAllocationStorage : public InternalAllocationStorage { public: using InternalAllocationStorage::InternalAllocationStorage; @@ -27,4 +27,4 @@ class MockInternalAllocationStorage : public InternalAllocationStorage { bool doUpdateCompletion = false; uint32_t valueToUpdateCompletion; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_kernel.cpp b/unit_tests/mocks/mock_kernel.cpp index 464de440e4..cb3f350ee8 100644 --- a/unit_tests/mocks/mock_kernel.cpp +++ b/unit_tests/mocks/mock_kernel.cpp @@ -10,7 +10,7 @@ #include "runtime/kernel/kernel.inl" #include "runtime/program/printf_handler.h" -namespace OCLRT { +namespace NEO { MockKernel::BlockPatchValues MockKernel::ReflectionSurfaceHelperPublic::devQueue; MockKernel::BlockPatchValues MockKernel::ReflectionSurfaceHelperPublic::defaultQueue; @@ -56,4 +56,4 @@ void MockKernel::getResidency(std::vector &dst) { bool MockKernel::requiresCacheFlushCommand(const CommandQueue &commandQueue) const { return DebugManager.flags.EnableCacheFlushAfterWalker.get(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_kernel.h b/unit_tests/mocks/mock_kernel.h index 5a803d6bc9..7e042db892 100644 --- a/unit_tests/mocks/mock_kernel.h +++ b/unit_tests/mocks/mock_kernel.h @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { //////////////////////////////////////////////////////////////////////////////// // Kernel - Core implementation @@ -597,4 +597,4 @@ class MockDebugKernel : public MockKernel { bool systemThreadSurfaceAllocated = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_mdi.h b/unit_tests/mocks/mock_mdi.h index b7c321eb79..d2dee74aa8 100644 --- a/unit_tests/mocks/mock_mdi.h +++ b/unit_tests/mocks/mock_mdi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/helpers/dispatch_info.h" -using namespace OCLRT; +using namespace NEO; class MockMultiDispatchInfo : public MultiDispatchInfo { public: diff --git a/unit_tests/mocks/mock_memory_manager.cpp b/unit_tests/mocks/mock_memory_manager.cpp index ecc0b02d7e..c33a77f0aa 100644 --- a/unit_tests/mocks/mock_memory_manager.cpp +++ b/unit_tests/mocks/mock_memory_manager.cpp @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { void MockMemoryManager::setDeferredDeleter(DeferredDeleter *deleter) { deferredDeleter.reset(deleter); @@ -95,4 +95,4 @@ FailMemoryManager::FailMemoryManager(int32_t failedAllocationsCount) { this->failedAllocationsCount = failedAllocationsCount; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_memory_manager.h b/unit_tests/mocks/mock_memory_manager.h index 1221020910..54d9f7baa5 100644 --- a/unit_tests/mocks/mock_memory_manager.h +++ b/unit_tests/mocks/mock_memory_manager.h @@ -12,7 +12,7 @@ #include "gmock/gmock.h" -namespace OCLRT { +namespace NEO { template class MemoryManagerCreate : public T { @@ -209,4 +209,4 @@ class GMockMemoryManagerFailFirstAllocation : public MockMemoryManager { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_os_context.h b/unit_tests/mocks/mock_os_context.h index 2f612f09d1..e60a5608cd 100644 --- a/unit_tests/mocks/mock_os_context.h +++ b/unit_tests/mocks/mock_os_context.h @@ -8,11 +8,11 @@ #pragma once #include "runtime/os_interface/os_context.h" -namespace OCLRT { +namespace NEO { class MockOsContext : public OsContext { public: MockOsContext(uint32_t contextId, DeviceBitfield deviceBitfield, EngineType engineType, PreemptionMode preemptionMode, bool lowPriority) : OsContext(contextId, deviceBitfield, engineType, preemptionMode, lowPriority) {} }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_ostime.h b/unit_tests/mocks/mock_ostime.h index a009b1cbca..d927e5afd0 100644 --- a/unit_tests/mocks/mock_ostime.h +++ b/unit_tests/mocks/mock_ostime.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/os_time.h" -namespace OCLRT { +namespace NEO { class MockOSTime : public OSTime { public: bool getCpuGpuTime(TimeStampData *pGpuCpuTime) override { @@ -35,4 +35,4 @@ class MockOSTime : public OSTime { return std::unique_ptr(new MockOSTime()); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_ostime_win.h b/unit_tests/mocks/mock_ostime_win.h index b19da0adba..d8fece31f2 100644 --- a/unit_tests/mocks/mock_ostime_win.h +++ b/unit_tests/mocks/mock_ostime_win.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/windows/os_time_win.h" -namespace OCLRT { +namespace NEO { class MockOSTimeWin : public OSTimeWin { public: MockOSTimeWin(Wddm *inWddm) { @@ -19,4 +19,4 @@ class MockOSTimeWin : public OSTimeWin { return OSTimeWin::getDynamicDeviceTimerResolution(hwInfo); }; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_physical_address_allocator.h b/unit_tests/mocks/mock_physical_address_allocator.h index a5e215251d..6f6b7a5f6b 100644 --- a/unit_tests/mocks/mock_physical_address_allocator.h +++ b/unit_tests/mocks/mock_physical_address_allocator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/memory_manager/physical_address_allocator.h" -using namespace OCLRT; +using namespace NEO; class MockPhysicalAddressAllocator : public PhysicalAddressAllocator { public: diff --git a/unit_tests/mocks/mock_pipe.h b/unit_tests/mocks/mock_pipe.h index 45cc738569..e7f15c6ce1 100644 --- a/unit_tests/mocks/mock_pipe.h +++ b/unit_tests/mocks/mock_pipe.h @@ -1,23 +1,8 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once @@ -25,7 +10,7 @@ #include "runtime/mem_obj/pipe.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -using namespace OCLRT; +using namespace NEO; class MockPipeStorage { public: diff --git a/unit_tests/mocks/mock_program.cpp b/unit_tests/mocks/mock_program.cpp index fea3123372..c5bdcf5299 100644 --- a/unit_tests/mocks/mock_program.cpp +++ b/unit_tests/mocks/mock_program.cpp @@ -13,7 +13,7 @@ #include "unit_tests/mocks/mock_compilers.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -namespace OCLRT { +namespace NEO { GlobalMockSipProgram *GlobalMockSipProgram::sipProgram; ExecutionEnvironment GlobalMockSipProgram::executionEnvironment; std::string MockProgram::getCachedFileName() const { @@ -123,4 +123,4 @@ Program *GlobalMockSipProgram::getSipProgramWithCustomBinary() { UNRECOVERABLE_IF(errCode != CL_SUCCESS); return program; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_program.h b/unit_tests/mocks/mock_program.h index d86452c4f3..e645d58356 100644 --- a/unit_tests/mocks/mock_program.h +++ b/unit_tests/mocks/mock_program.h @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; @@ -161,4 +161,4 @@ class GMockProgram : public Program { MOCK_METHOD0(appendKernelDebugOptions, bool(void)); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_sampler.h b/unit_tests/mocks/mock_sampler.h index 3d2f44c433..48a8052161 100644 --- a/unit_tests/mocks/mock_sampler.h +++ b/unit_tests/mocks/mock_sampler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/sampler/sampler.h" -namespace OCLRT { +namespace NEO { struct MockSampler : public Sampler { public: @@ -41,4 +41,4 @@ struct MockSampler : public Sampler { void setArg(void *memory) override { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_sip.cpp b/unit_tests/mocks/mock_sip.cpp index 545429cc1f..33ffe169bc 100644 --- a/unit_tests/mocks/mock_sip.cpp +++ b/unit_tests/mocks/mock_sip.cpp @@ -20,7 +20,7 @@ #include #include -namespace OCLRT { +namespace NEO { std::vector MockSipKernel::dummyBinaryForSip; std::vector MockSipKernel::getDummyGenBinary() { if (dummyBinaryForSip.size() == 0) { @@ -48,4 +48,4 @@ void MockSipKernel::initDummyBinary() { void MockSipKernel::shutDown() { MockSipKernel::dummyBinaryForSip.clear(); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/mocks/mock_sip.h b/unit_tests/mocks/mock_sip.h index 17af7aa666..27db402320 100644 --- a/unit_tests/mocks/mock_sip.h +++ b/unit_tests/mocks/mock_sip.h @@ -10,7 +10,7 @@ #include "runtime/built_ins/sip.h" #include -namespace OCLRT { +namespace NEO { class MockSipKernel : public SipKernel { public: static std::vector dummyBinaryForSip; @@ -19,4 +19,4 @@ class MockSipKernel : public SipKernel { static void initDummyBinary(); static void shutDown(); }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/mocks/mock_source_level_debugger.h b/unit_tests/mocks/mock_source_level_debugger.h index 4bd570afdf..da8b7e4738 100644 --- a/unit_tests/mocks/mock_source_level_debugger.h +++ b/unit_tests/mocks/mock_source_level_debugger.h @@ -18,7 +18,7 @@ #pragma clang diagnostic ignored "-Winconsistent-missing-override" #endif -using namespace OCLRT; +using namespace NEO; class MockSourceLevelDebugger : public SourceLevelDebugger { public: diff --git a/unit_tests/mocks/mock_submissions_aggregator.h b/unit_tests/mocks/mock_submissions_aggregator.h index 624e4e8c18..fe2e86b61c 100644 --- a/unit_tests/mocks/mock_submissions_aggregator.h +++ b/unit_tests/mocks/mock_submissions_aggregator.h @@ -1,30 +1,15 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #pragma once #include "runtime/command_stream/submissions_aggregator.h" -namespace OCLRT { +namespace NEO { struct mockSubmissionsAggregator : public SubmissionAggregator { CommandBufferList &peekCommandBuffers() { return this->cmdBuffers; @@ -33,4 +18,4 @@ struct mockSubmissionsAggregator : public SubmissionAggregator { return this->inspectionId; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_svm_manager.h b/unit_tests/mocks/mock_svm_manager.h index 62351bf3ac..71ab2f2210 100644 --- a/unit_tests/mocks/mock_svm_manager.h +++ b/unit_tests/mocks/mock_svm_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,11 +7,11 @@ #pragma once #include "runtime/memory_manager/svm_memory_manager.h" -namespace OCLRT { +namespace NEO { struct MockSVMAllocsManager : SVMAllocsManager { using SVMAllocsManager::memoryManager; using SVMAllocsManager::SVMAllocs; using SVMAllocsManager::SVMAllocsManager; }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/mocks/mock_tbx_csr.h b/unit_tests/mocks/mock_tbx_csr.h index 6bf23484a2..7af095ca22 100644 --- a/unit_tests/mocks/mock_tbx_csr.h +++ b/unit_tests/mocks/mock_tbx_csr.h @@ -17,7 +17,7 @@ #include -namespace OCLRT { +namespace NEO { template class MockTbxCsrToTestWaitBeforeMakingNonResident : public TbxCommandStreamReceiverHw { @@ -115,4 +115,4 @@ std::unique_ptr getEnvironment(bool createTagAllocation tbxExecutionEnvironment->executionEnvironment = std::move(executionEnvironment); return tbxExecutionEnvironment; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_tbx_sockets.h b/unit_tests/mocks/mock_tbx_sockets.h index 595c822463..11745a529f 100644 --- a/unit_tests/mocks/mock_tbx_sockets.h +++ b/unit_tests/mocks/mock_tbx_sockets.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/tbx/tbx_sockets.h" -namespace OCLRT { +namespace NEO { class MockTbxSockets : public TbxSockets { public: @@ -31,4 +31,4 @@ class MockTbxSockets : public TbxSockets { uint32_t typeCapturedFromWriteMemory = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_tbx_stream.h b/unit_tests/mocks/mock_tbx_stream.h index 26b3edc29b..314dcf533b 100644 --- a/unit_tests/mocks/mock_tbx_stream.h +++ b/unit_tests/mocks/mock_tbx_stream.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,9 +9,9 @@ #include "runtime/command_stream/tbx_command_stream_receiver.h" -namespace OCLRT { +namespace NEO { struct MockTbxStream : public TbxCommandStreamReceiver::TbxStream { using TbxCommandStreamReceiver::TbxStream::socket; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_wddm.cpp b/unit_tests/mocks/mock_wddm.cpp index e4310f2826..b6ab07f29b 100644 --- a/unit_tests/mocks/mock_wddm.cpp +++ b/unit_tests/mocks/mock_wddm.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; WddmMock::~WddmMock() { EXPECT_EQ(0, reservedAddresses.size()); diff --git a/unit_tests/mocks/mock_wddm.h b/unit_tests/mocks/mock_wddm.h index 2bf8e8a7fa..fbc0c043fc 100644 --- a/unit_tests/mocks/mock_wddm.h +++ b/unit_tests/mocks/mock_wddm.h @@ -16,7 +16,7 @@ #include #include -namespace OCLRT { +namespace NEO { class GraphicsAllocation; namespace WddmMockHelpers { @@ -150,14 +150,14 @@ class WddmMock : public Wddm { bool failOpenSharedHandle = false; bool callBaseMapGpuVa = true; std::set reservedAddresses; - uintptr_t virtualAllocAddress = OCLRT::windowsMinAddress; + uintptr_t virtualAllocAddress = NEO::windowsMinAddress; bool kmDafEnabled = false; uint64_t mockPagingFence = 0u; }; struct GmockWddm : WddmMock { GmockWddm() { - virtualAllocAddress = OCLRT::windowsMinAddress; + virtualAllocAddress = NEO::windowsMinAddress; } ~GmockWddm() = default; bool virtualFreeWrapper(void *ptr, size_t size, uint32_t flags) { @@ -174,4 +174,4 @@ struct GmockWddm : WddmMock { return Wddm::createAllocationsAndMapGpuVa(osHandles); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mocks/mock_wddm_interface23.h b/unit_tests/mocks/mock_wddm_interface23.h index 7fa9e82708..447ece636b 100644 --- a/unit_tests/mocks/mock_wddm_interface23.h +++ b/unit_tests/mocks/mock_wddm_interface23.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/windows/wddm/wddm_interface.h" -namespace OCLRT { +namespace NEO { class WddmMockInterface23 : public WddmInterface23 { public: using WddmInterface23::WddmInterface23; @@ -24,4 +24,4 @@ class WddmMockInterface23 : public WddmInterface23 { bool forceCreateHwQueueFail = false; bool createHwQueueResult = false; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp b/unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp index 80c56915bf..138527028f 100644 --- a/unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp +++ b/unit_tests/mt_tests/device_queue/device_queue_mt_tests.cpp @@ -10,7 +10,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_device_queue.h" -using namespace OCLRT; +using namespace NEO; typedef ::testing::Test DeviceQueueHwMtTest; diff --git a/unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp b/unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp index 13a0ba42af..215ffac70a 100644 --- a/unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp +++ b/unit_tests/mt_tests/memory_manager/deferred_deleter_clear_queue_mt_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; const int threadCount = 4; diff --git a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp index 671765482c..be57c43c7f 100644 --- a/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp +++ b/unit_tests/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp @@ -17,7 +17,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; TEST(DrmMemoryManagerTest, givenDrmMemoryManagerWhenSharedAllocationIsCreatedFromMultipleThreadsThenSingleBoIsReused) { diff --git a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp index 17d27ed9d7..c3bb33efe2 100644 --- a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp +++ b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { struct MockReferenceTrackedObject : ReferenceTrackedObject { MockReferenceTrackedObject(std::atomic &marker, @@ -130,4 +130,4 @@ TEST(ReferenceTrackedObject, whenDecreasingInternalRefcountSimultaneouslyWillRet EXPECT_EQ(MockReferenceTrackedObjectDerivative::GetMarker(), marker); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/offline_compiler/decoder/decoder_tests.cpp b/unit_tests/offline_compiler/decoder/decoder_tests.cpp index 650714a0cf..3518da6626 100644 --- a/unit_tests/offline_compiler/decoder/decoder_tests.cpp +++ b/unit_tests/offline_compiler/decoder/decoder_tests.cpp @@ -26,7 +26,7 @@ SKernelBinaryHeaderCommon createKernelBinaryHeaderCommon(const uint32_t kernelNa return kernelHeader; } -namespace OCLRT { +namespace NEO { TEST(DecoderTests, WhenParsingValidListOfParametersThenReturnValueIsZero) { const char *argv[] = { "ocloc", @@ -292,4 +292,4 @@ TEST(DecoderTests, GivenValidBinaryWhenProcessingBinaryThenProgramAndKernelAndPa std::string expectedOutput = "ProgramBinaryHeader:\n\t4 Magic 1229870147\n\t4 Version 0\n\t4 Device 0\n\t4 GPUPointerSizeInBytes 0\n\t4 NumberOfKernels 1\n\t4 SteppingId 0\n\t4 PatchListSize 30\nPATCH_TOKEN_ALLOCATE_CONSTANT_MEMORY_SURFACE_PROGRAM_BINARY_INFO:\n\t4 Token 42\n\t4 Size 16\n\t4 ConstantBufferIndex 0\n\t4 InlineDataSize 14\n\tHex 0 1 2 3 4 5 6 7 8 9 a b c d\nKernel #0\nKernelBinaryHeader:\n\t4 CheckSum 4294967295\n\t8 ShaderHashCode 18446744073709551615\n\t4 KernelNameSize 14\n\t4 PatchListSize 12\n\t4 KernelHeapSize 0\n\t4 GeneralStateHeapSize 0\n\t4 DynamicStateHeapSize 0\n\t4 SurfaceStateHeapSize 0\n\t4 KernelUnpaddedSize 0\n\tKernelName ExampleKernel\nPATCH_TOKEN_MEDIA_INTERFACE_DESCRIPTOR_LOAD:\n\t4 Token 19\n\t4 Size 12\n\t4 InterfaceDescriptorDataOffset 0\n"; EXPECT_EQ(expectedOutput, ptmFile.str()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/offline_compiler/decoder/encoder_tests.cpp b/unit_tests/offline_compiler/decoder/encoder_tests.cpp index d8e79d7212..7e88990d1f 100644 --- a/unit_tests/offline_compiler/decoder/encoder_tests.cpp +++ b/unit_tests/offline_compiler/decoder/encoder_tests.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { TEST(EncoderTests, WhenParsingValidListOfParametersThenReturnValueIsZero) { const char *argv[] = { "ocloc", @@ -243,4 +243,4 @@ TEST(EncoderTests, GivenCorrectPTMFileWhileProcessingThenCorrectBinaryIsExpected EXPECT_EQ(-1, retVal); EXPECT_EQ(expectedBinary.str(), binary.str()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/offline_compiler/environment.h b/unit_tests/offline_compiler/environment.h index 41ae2f1e69..f6d141ceb8 100644 --- a/unit_tests/offline_compiler/environment.h +++ b/unit_tests/offline_compiler/environment.h @@ -26,8 +26,8 @@ class Environment : public ::testing::Environment { retrieveBinaryKernelFilename(igcDebugVars.fileName, filename + "_", ".gen"); retrieveBinaryKernelFilename(fclDebugVars.fileName, filename + "_", ".bc"); - OCLRT::setIgcDebugVars(igcDebugVars); - OCLRT::setFclDebugVars(fclDebugVars); + NEO::setIgcDebugVars(igcDebugVars); + NEO::setFclDebugVars(fclDebugVars); } void SetUp() override { @@ -41,16 +41,16 @@ class Environment : public ::testing::Environment { mockCompilerGuard.Disable(); } - OCLRT::OsLibrary *libraryFrontEnd; - OCLRT::OsLibrary *libraryIGC; + NEO::OsLibrary *libraryFrontEnd; + NEO::OsLibrary *libraryIGC; - OCLRT::MockCompilerDebugVars igcDebugVars; - OCLRT::MockCompilerDebugVars fclDebugVars; + NEO::MockCompilerDebugVars igcDebugVars; + NEO::MockCompilerDebugVars fclDebugVars; - void (*igcSetDebugVarsFPtr)(OCLRT::MockCompilerDebugVars &debugVars); - void (*fclSetDebugVarsFPtr)(OCLRT::MockCompilerDebugVars &debugVars); + void (*igcSetDebugVarsFPtr)(NEO::MockCompilerDebugVars &debugVars); + void (*fclSetDebugVarsFPtr)(NEO::MockCompilerDebugVars &debugVars); - OCLRT::MockCompilerEnableGuard mockCompilerGuard; + NEO::MockCompilerEnableGuard mockCompilerGuard; const std::string devicePrefix; const std::string familyNameWithType; diff --git a/unit_tests/offline_compiler/mock/mock_offline_compiler.h b/unit_tests/offline_compiler/mock/mock_offline_compiler.h index 878de8a698..cf73d4a53c 100644 --- a/unit_tests/offline_compiler/mock/mock_offline_compiler.h +++ b/unit_tests/offline_compiler/mock/mock_offline_compiler.h @@ -10,7 +10,7 @@ #include -namespace OCLRT { +namespace NEO { class MockOfflineCompiler : public OfflineCompiler { public: @@ -95,4 +95,4 @@ class MockOfflineCompiler : public OfflineCompiler { return genBinarySize; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp index e83a22526c..68e733c98e 100644 --- a/unit_tests/offline_compiler/offline_compiler_tests.cpp +++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp @@ -22,7 +22,7 @@ extern Environment *gEnvironment; -namespace OCLRT { +namespace NEO { std::string getCompilerOutputFileName(const std::string &fileName, const std::string &type) { std::string fName(fileName); @@ -152,7 +152,7 @@ TEST_F(OfflineCompilerTests, GoodParseBinToCharArray) { " 0x40032302, 0x90800756, 0x05340301, 0x66097860, 0x101010ff, 0x40032302, 0x90800756, 0x05340301, \n" " 0x66097860, 0xff000000};\n\n" "#include \"runtime/built_ins/registry/built_ins_registry.h\"\n\n" - "namespace OCLRT {\n" + "namespace NEO {\n" "static RegisterEmbeddedResource registerSchedulerBin(\n" " createBuiltinResourceName(\n" " EBuiltInOps::Scheduler,\n" @@ -641,7 +641,7 @@ TEST(OfflineCompilerTest, givenIntermediatedRepresentationInputWhenBuildSourceCo gEnvironment->devicePrefix.c_str()}; auto retVal = mockOfflineCompiler.initialize(argv.size(), argv.begin()); - auto mockIgcOclDeviceCtx = new OCLRT::MockIgcOclDeviceCtx(); + auto mockIgcOclDeviceCtx = new NEO::MockIgcOclDeviceCtx(); mockOfflineCompiler.igcDeviceCtx = CIF::RAII::Pack(mockIgcOclDeviceCtx); ASSERT_EQ(CL_SUCCESS, retVal); @@ -649,7 +649,7 @@ TEST(OfflineCompilerTest, givenIntermediatedRepresentationInputWhenBuildSourceCo retVal = mockOfflineCompiler.buildSourceCode(); EXPECT_EQ(CL_SUCCESS, retVal); ASSERT_EQ(1U, mockIgcOclDeviceCtx->requestedTranslationCtxs.size()); - OCLRT::MockIgcOclDeviceCtx::TranslationOpT expectedTranslation = {IGC::CodeType::spirV, IGC::CodeType::oclGenBin}; + NEO::MockIgcOclDeviceCtx::TranslationOpT expectedTranslation = {IGC::CodeType::spirV, IGC::CodeType::oclGenBin}; ASSERT_EQ(expectedTranslation, mockIgcOclDeviceCtx->requestedTranslationCtxs[0]); mockOfflineCompiler.inputFileSpirV = false; @@ -724,7 +724,7 @@ TEST(OfflineCompilerTest, givenDebugDataAvailableWhenSourceIsBuiltThenDebugDataF igcDebugVars.debugDataToReturn = debugData; igcDebugVars.debugDataToReturnSize = sizeof(debugData); - OCLRT::setIgcDebugVars(igcDebugVars); + NEO::setIgcDebugVars(igcDebugVars); auto mockOfflineCompiler = std::unique_ptr(new MockOfflineCompiler()); ASSERT_NE(nullptr, mockOfflineCompiler); @@ -751,7 +751,7 @@ TEST(OfflineCompilerTest, givenDebugDataAvailableWhenSourceIsBuiltThenDebugDataF compilerOutputRemove("myOutputFileName", "gen"); compilerOutputRemove("myOutputFileName", "dbg"); - OCLRT::setIgcDebugVars(gEnvironment->igcDebugVars); + NEO::setIgcDebugVars(gEnvironment->igcDebugVars); } TEST(OfflineCompilerTest, givenInternalOptionsWhenCmdLineParsedThenOptionsAreAppendedToInternalOptionsString) { @@ -872,4 +872,4 @@ TEST(OfflineCompilerTest, givenEnabledOptsSuffixWhenGenerateOptsSuffixIsCalledTh EXPECT_STREQ("A_B_C", suffix.c_str()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/offline_compiler/offline_compiler_tests.h b/unit_tests/offline_compiler/offline_compiler_tests.h index 7d0b4f2b00..32dd1ff5de 100644 --- a/unit_tests/offline_compiler/offline_compiler_tests.h +++ b/unit_tests/offline_compiler/offline_compiler_tests.h @@ -13,7 +13,7 @@ #include -namespace OCLRT { +namespace NEO { class OfflineCompilerTests : public ::testing::Test { public: @@ -26,4 +26,4 @@ class OfflineCompilerTests : public ::testing::Test { int retVal; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/options.cpp b/unit_tests/options.cpp index e0b465cef1..4e9852a992 100644 --- a/unit_tests/options.cpp +++ b/unit_tests/options.cpp @@ -11,7 +11,7 @@ #include "runtime/helpers/array_count.h" #include "runtime/helpers/hw_info.h" -namespace OCLRT { +namespace NEO { const char *folderAUB = "aub_out"; uint32_t initialHardwareTag = static_cast(0xFFFFFF00); @@ -22,4 +22,4 @@ static const HardwareInfo *DefaultPlatformDevices[] = { size_t numPlatformDevices = arrayCount(DefaultPlatformDevices); const HardwareInfo **platformDevices = DefaultPlatformDevices; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/32bit_memory_tests.cpp b/unit_tests/os_interface/32bit_memory_tests.cpp index f39911eb9b..6a1af5a2cc 100644 --- a/unit_tests/os_interface/32bit_memory_tests.cpp +++ b/unit_tests/os_interface/32bit_memory_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(Memory32Bit, Given32bitAllocatorWhenAskedForAllocationThen32BitPointerIsReturned) { size_t size = 100u; diff --git a/unit_tests/os_interface/debug_settings_manager_fixture.h b/unit_tests/os_interface/debug_settings_manager_fixture.h index 8dcf95be1e..6d97c55a99 100644 --- a/unit_tests/os_interface/debug_settings_manager_fixture.h +++ b/unit_tests/os_interface/debug_settings_manager_fixture.h @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; using namespace std; #undef DECLARE_DEBUG_VARIABLE diff --git a/unit_tests/os_interface/device_factory_tests.cpp b/unit_tests/os_interface/device_factory_tests.cpp index 001adeab1e..9bb2c67cb4 100644 --- a/unit_tests/os_interface/device_factory_tests.cpp +++ b/unit_tests/os_interface/device_factory_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace); diff --git a/unit_tests/os_interface/hw_info_config_tests.cpp b/unit_tests/os_interface/hw_info_config_tests.cpp index 77c63fe8de..6503500d4a 100644 --- a/unit_tests/os_interface/hw_info_config_tests.cpp +++ b/unit_tests/os_interface/hw_info_config_tests.cpp @@ -10,7 +10,7 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/options.h" -using namespace OCLRT; +using namespace NEO; using namespace std; void HwInfoConfigTest::SetUp() { diff --git a/unit_tests/os_interface/hw_info_config_tests.h b/unit_tests/os_interface/hw_info_config_tests.h index 486792f248..ca3ce625b8 100644 --- a/unit_tests/os_interface/hw_info_config_tests.h +++ b/unit_tests/os_interface/hw_info_config_tests.h @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTest : public ::testing::Test, diff --git a/unit_tests/os_interface/linux/allocator_helper.cpp b/unit_tests/os_interface/linux/allocator_helper.cpp index 3ed85008b6..f8e12912af 100644 --- a/unit_tests/os_interface/linux/allocator_helper.cpp +++ b/unit_tests/os_interface/linux/allocator_helper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/os_interface/linux/allocator_helper.h" -namespace OCLRT { +namespace NEO { size_t getSizeToMap() { return static_cast(1 * 1024 * 1024u); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/allocator_helper_tests.cpp b/unit_tests/os_interface/linux/allocator_helper_tests.cpp index b219ef462d..3106b34991 100644 --- a/unit_tests/os_interface/linux/allocator_helper_tests.cpp +++ b/unit_tests/os_interface/linux/allocator_helper_tests.cpp @@ -10,5 +10,5 @@ #include "gtest/gtest.h" TEST(AllocatorHelper, givenExpectedSizeToMapWhenGetSizetoMapCalledThenExpectedValueReturned) { - EXPECT_EQ(1 * 1024 * 1024u, OCLRT::getSizeToMap()); + EXPECT_EQ(1 * 1024 * 1024u, NEO::getSizeToMap()); } diff --git a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp index 260fd48749..f704df1043 100644 --- a/unit_tests/os_interface/linux/create_drm_memory_manager.cpp +++ b/unit_tests/os_interface/linux/create_drm_memory_manager.cpp @@ -12,7 +12,7 @@ #include "runtime/os_interface/os_interface.h" #include "unit_tests/libult/create_command_stream.h" -namespace OCLRT { +namespace NEO { bool overrideMemoryManagerCreation = true; std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { @@ -24,4 +24,4 @@ std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvir true, executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/debug_env_reader.cpp b/unit_tests/os_interface/linux/debug_env_reader.cpp index 5637203d04..ff585f4d53 100644 --- a/unit_tests/os_interface/linux/debug_env_reader.cpp +++ b/unit_tests/os_interface/linux/debug_env_reader.cpp @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { class DebugEnvReaderTests : public ::testing::Test { public: @@ -82,4 +82,4 @@ TEST_F(DebugEnvReaderTests, givenEnvironmentVariableReaderWhenCreateOsReaderWith std::unique_ptr evr(SettingsReader::createOsReader("")); EXPECT_NE(nullptr, evr); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/device_command_stream_fixture.h b/unit_tests/os_interface/linux/device_command_stream_fixture.h index be5ce22a9b..a0f3a881c0 100644 --- a/unit_tests/os_interface/linux/device_command_stream_fixture.h +++ b/unit_tests/os_interface/linux/device_command_stream_fixture.h @@ -23,7 +23,7 @@ #define RENDER_DEVICE_NAME_MATCHER ::testing::StrEq("/dev/dri/renderD128") -using OCLRT::Drm; +using NEO::Drm; static const int mockFd = 33; @@ -273,7 +273,7 @@ class DrmMockCustom : public Drm { DrmMockCustom() : Drm(mockFd) { reset(); - ioctl_expected.contextCreate = static_cast(OCLRT::HwHelper::get(OCLRT::platformDevices[0]->pPlatform->eRenderCoreFamily).getGpgpuEngineInstances().size()); + ioctl_expected.contextCreate = static_cast(NEO::HwHelper::get(NEO::platformDevices[0]->pPlatform->eRenderCoreFamily).getGpgpuEngineInstances().size()); ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load(); } int getErrno() override { diff --git a/unit_tests/os_interface/linux/device_command_stream_tests.cpp b/unit_tests/os_interface/linux/device_command_stream_tests.cpp index 4cf5e62ba5..bae9588a02 100644 --- a/unit_tests/os_interface/linux/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/device_command_stream_tests.cpp @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct DeviceCommandStreamLeaksTest : ::testing::Test { void SetUp() override { diff --git a/unit_tests/os_interface/linux/device_factory_tests.h b/unit_tests/os_interface/linux/device_factory_tests.h index c33af82e57..35b65df649 100644 --- a/unit_tests/os_interface/linux/device_factory_tests.h +++ b/unit_tests/os_interface/linux/device_factory_tests.h @@ -17,12 +17,12 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { void pushDrmMock(Drm *mock); void popDrmMock(); -}; // namespace OCLRT +}; // namespace NEO -using namespace OCLRT; +using namespace NEO; struct DeviceFactoryLinuxTest : public ::testing::Test { void SetUp() override { diff --git a/unit_tests/os_interface/linux/device_os_tests.cpp b/unit_tests/os_interface/linux/device_os_tests.cpp index 278b3d3c80..2c92b1b64d 100644 --- a/unit_tests/os_interface/linux/device_os_tests.cpp +++ b/unit_tests/os_interface/linux/device_os_tests.cpp @@ -21,7 +21,7 @@ using namespace ::testing; -namespace OCLRT { +namespace NEO { TEST(DeviceOsTest, osSpecificExtensions) { auto hwInfo = *platformDevices; auto pDevice = MockDevice::createWithNewExecutionEnvironment(hwInfo); @@ -102,4 +102,4 @@ TEST(DeviceOsTest, DeviceCreationFailMidThreadPreemption) { EXPECT_THAT(pDevice, nullptr); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/driver_info_tests.cpp b/unit_tests/os_interface/linux/driver_info_tests.cpp index 8b69cd16bd..493314de14 100644 --- a/unit_tests/os_interface/linux/driver_info_tests.cpp +++ b/unit_tests/os_interface/linux/driver_info_tests.cpp @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { TEST(DriverInfo, GivenCreateDriverInfoWhenLinuxThenReturnNewInstance) { std::unique_ptr driverInfo(DriverInfo::create(nullptr)); @@ -33,4 +33,4 @@ TEST(DriverInfo, GivenDriverInfoWhenLinuxThenReturnDefault) { EXPECT_STREQ(defaultVersion.c_str(), resultVersion.c_str()); } -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/os_interface/linux/drm_buffer_object_tests.cpp b/unit_tests/os_interface/linux/drm_buffer_object_tests.cpp index 24f8853407..5144427cc4 100644 --- a/unit_tests/os_interface/linux/drm_buffer_object_tests.cpp +++ b/unit_tests/os_interface/linux/drm_buffer_object_tests.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; class TestedBufferObject : public BufferObject { public: diff --git a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp index 72816d69bb..b0918cbda6 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/os_interface/linux/device_command_stream_fixture.h" -using namespace OCLRT; +using namespace NEO; class DrmCommandStreamMMTest : public ::testing::Test { }; diff --git a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp index 4bca3ec563..2371751e59 100644 --- a/unit_tests/os_interface/linux/drm_command_stream_tests.cpp +++ b/unit_tests/os_interface/linux/drm_command_stream_tests.cpp @@ -28,7 +28,7 @@ #include "drm/i915_drm.h" #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; class DrmCommandStreamFixture { public: diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp index 65ad5ee733..e97a0739ed 100644 --- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -27,7 +27,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; class DrmMockForWorker : public Drm { public: diff --git a/unit_tests/os_interface/linux/drm_mapper_tests.cpp b/unit_tests/os_interface/linux/drm_mapper_tests.cpp index 69219fa32b..adfe985ece 100644 --- a/unit_tests/os_interface/linux/drm_mapper_tests.cpp +++ b/unit_tests/os_interface/linux/drm_mapper_tests.cpp @@ -10,7 +10,7 @@ #include "drm/i915_drm.h" -using namespace OCLRT; +using namespace NEO; TEST(DrmMapperTests, engineNodeMapPass) { unsigned int flag = DrmEngineMapper::engineNodeMap(EngineType::ENGINE_RCS); diff --git a/unit_tests/os_interface/linux/drm_memory_info_tests.cpp b/unit_tests/os_interface/linux/drm_memory_info_tests.cpp index 40c624b68c..bc0b8abfc8 100644 --- a/unit_tests/os_interface/linux/drm_memory_info_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_info_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(DrmTest, whenQueryingMemoryInfoThenMemoryInfoIsNotCreatedAndNoIoctlIsCalled) { std::unique_ptr drm = std::make_unique(); @@ -23,7 +23,7 @@ TEST(DrmTest, whenQueryingMemoryInfoThenMemoryInfoIsNotCreatedAndNoIoctlIsCalled } TEST(MemoryInfo, givenMemoryInfoImplementationWhenDestructingThenDestructorIsCalled) { - struct MemoryInfoImpl : public OCLRT::MemoryInfo { + struct MemoryInfoImpl : public NEO::MemoryInfo { MemoryInfoImpl() {} ~MemoryInfoImpl() override{}; }; diff --git a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp index 118ce97db4..7226cab777 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/mocks/linux/mock_drm_memory_manager.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; using AllocationData = TestedDrmMemoryManager::AllocationData; diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index e2acc41905..52db8cf728 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -44,7 +44,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; AllocationProperties createAllocationProperties(size_t size, bool forcePin) { MockAllocationProperties properties(size); diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.h b/unit_tests/os_interface/linux/drm_memory_manager_tests.h index b1edc12a70..2bc93a76ed 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.h +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.h @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { using AllocationData = TestedDrmMemoryManager::AllocationData; @@ -97,4 +97,4 @@ class DrmMemoryManagerFixtureWithoutQuietIoctlExpectation { std::unique_ptr device; DrmMockCustom::IoctlResExt ioctlResExt = {0, 0}; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/drm_mock.h b/unit_tests/os_interface/linux/drm_mock.h index 0a4c67b6c8..ddaf767491 100644 --- a/unit_tests/os_interface/linux/drm_mock.h +++ b/unit_tests/os_interface/linux/drm_mock.h @@ -17,7 +17,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; #if !defined(I915_PARAM_HAS_PREEMPTION) #define I915_PARAM_HAS_PREEMPTION 0x806 diff --git a/unit_tests/os_interface/linux/drm_neo_create.cpp b/unit_tests/os_interface/linux/drm_neo_create.cpp index 1c826c36d8..413265e146 100644 --- a/unit_tests/os_interface/linux/drm_neo_create.cpp +++ b/unit_tests/os_interface/linux/drm_neo_create.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { static std::vector drmMockStack; @@ -58,4 +58,4 @@ Drm *Drm::create(int32_t deviceOrdinal) { } void Drm::closeDevice(int32_t deviceOrdinal) { drmMockStack[drmMockStack.size() - 1]->fd = -1; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/drm_tests.cpp b/unit_tests/os_interface/linux/drm_tests.cpp index bbacb1bf58..ff5d192e72 100644 --- a/unit_tests/os_interface/linux/drm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; using namespace std; TEST(DrmTest, GetDeviceID) { diff --git a/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp b/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp index f6f89303a9..c3cfb8e143 100644 --- a/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp +++ b/unit_tests/os_interface/linux/hw_info_config_linux_tests.cpp @@ -14,7 +14,7 @@ #include -namespace OCLRT { +namespace NEO { constexpr uint32_t hwConfigTestMidThreadBit = 1 << 8; constexpr uint32_t hwConfigTestThreadGroupBit = 1 << 9; @@ -44,12 +44,12 @@ template <> void HwInfoConfigHw::adjustPlatformForProductFamily(HardwareInfo *hwInfo) { } -} // namespace OCLRT +} // namespace NEO struct DummyHwConfig : HwInfoConfigHw { }; -using namespace OCLRT; +using namespace NEO; using namespace std; void mockCpuidex(int *cpuInfo, int functionId, int subfunctionId); diff --git a/unit_tests/os_interface/linux/hw_info_config_linux_tests.h b/unit_tests/os_interface/linux/hw_info_config_linux_tests.h index 59603923d3..6c6b8dfa4b 100644 --- a/unit_tests/os_interface/linux/hw_info_config_linux_tests.h +++ b/unit_tests/os_interface/linux/hw_info_config_linux_tests.h @@ -13,7 +13,7 @@ #include "unit_tests/os_interface/hw_info_config_tests.h" #include "unit_tests/os_interface/linux/drm_mock.h" -using namespace OCLRT; +using namespace NEO; using namespace std; struct HwInfoConfigTestLinux : public HwInfoConfigTest { diff --git a/unit_tests/os_interface/linux/mock_os_time_linux.h b/unit_tests/os_interface/linux/mock_os_time_linux.h index 9ca0b67369..fa937403ae 100644 --- a/unit_tests/os_interface/linux/mock_os_time_linux.h +++ b/unit_tests/os_interface/linux/mock_os_time_linux.h @@ -9,7 +9,7 @@ #include "runtime/os_interface/linux/os_interface.h" #include "runtime/os_interface/linux/os_time_linux.h" -namespace OCLRT { +namespace NEO { class MockOSTimeLinux : public OSTimeLinux { public: MockOSTimeLinux(OSInterface *osInterface) : OSTimeLinux(osInterface){}; @@ -28,4 +28,4 @@ class MockOSTimeLinux : public OSTimeLinux { return std::unique_ptr(new MockOSTimeLinux(osInterface)); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp b/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp index 4a6b8c1a6d..d060ded008 100644 --- a/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp +++ b/unit_tests/os_interface/linux/mock_performance_counters_linux.cpp @@ -10,7 +10,7 @@ #include "unit_tests/os_interface/linux/drm_mock.h" #include "unit_tests/os_interface/linux/mock_os_time_linux.h" -namespace OCLRT { +namespace NEO { MockPerformanceCountersLinux::MockPerformanceCountersLinux(OSTime *osTime) : PerformanceCounters(osTime), PerformanceCountersLinux(osTime), MockPerformanceCounters(osTime) { dlopenFunc = dlopenMockPassing; @@ -86,4 +86,4 @@ void PerformanceCountersFixture::fillOsInterface() { void PerformanceCountersFixture::releaseOsInterface() { delete static_cast(osInterfaceBase->get()->getDrm()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/mock_performance_counters_linux.h b/unit_tests/os_interface/linux/mock_performance_counters_linux.h index 665e52a87e..ac6677853b 100644 --- a/unit_tests/os_interface/linux/mock_performance_counters_linux.h +++ b/unit_tests/os_interface/linux/mock_performance_counters_linux.h @@ -1,30 +1,15 @@ /* -* Copyright (c) 2017, Intel Corporation -* -* Permission is hereby granted, free of charge, to any person obtaining a -* copy of this software and associated documentation files (the "Software"), -* to deal in the Software without restriction, including without limitation -* the rights to use, copy, modify, merge, publish, distribute, sublicense, -* and/or sell copies of the Software, and to permit persons to whom the -* Software is furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -* OTHER DEALINGS IN THE SOFTWARE. -*/ + * Copyright (C) 2017-2019 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ #pragma once #include "runtime/os_interface/linux/performance_counters_linux.h" #include "unit_tests/os_interface/mock_performance_counters.h" -namespace OCLRT { +namespace NEO { void *dlopenMockPassing(const char *filename, int flag) throw(); void *dlopenMockFailing(const char *filename, int flag) throw(); @@ -75,4 +60,4 @@ class MockPerformanceCountersLinux : public PerformanceCountersLinux, perfmonLoadConfigFunc = func; } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/options.cpp b/unit_tests/os_interface/linux/options.cpp index 61d0c537e8..17ae678037 100644 --- a/unit_tests/os_interface/linux/options.cpp +++ b/unit_tests/os_interface/linux/options.cpp @@ -26,6 +26,6 @@ const char *gmmEntryName = "openMockGmm"; const char *sysFsPciPath = "./test_files"; } // namespace Os -OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace) { +NEO::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace) { return nullptr; } diff --git a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp index 12a4b41fca..f6e38833f9 100644 --- a/unit_tests/os_interface/linux/os_interface_linux_tests.cpp +++ b/unit_tests/os_interface/linux/os_interface_linux_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { TEST(OsInterfaceTest, GivenLinuxWhenare64kbPagesEnabledThenFalse) { EXPECT_FALSE(OSInterface::are64kbPagesEnabled()); @@ -24,4 +24,4 @@ TEST(OsInterfaceTest, GivenLinuxOsInterfaceWhenDeviceHandleQueriedthenZeroIsRetu EXPECT_EQ(0u, osInterface.getDeviceHandle()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/linux/os_time_test.cpp b/unit_tests/os_interface/linux/os_time_test.cpp index 920c50e0cb..bdee5a5009 100644 --- a/unit_tests/os_interface/linux/os_time_test.cpp +++ b/unit_tests/os_interface/linux/os_time_test.cpp @@ -36,7 +36,7 @@ int resolutionFuncTrue(clockid_t clkId, struct timespec *res) throw() { return 0; } -using namespace OCLRT; +using namespace NEO; struct DrmTimeTest : public ::testing::Test { public: void SetUp() override { diff --git a/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp b/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp index eee7f7ac41..2b48629c69 100644 --- a/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp +++ b/unit_tests/os_interface/linux/performance_counters_linux_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" #include "mock_performance_counters_linux.h" -using namespace OCLRT; +using namespace NEO; struct PerformanceCountersLinuxTest : public PerformanceCountersFixture, public ::testing::Test { diff --git a/unit_tests/os_interface/mock_performance_counters.cpp b/unit_tests/os_interface/mock_performance_counters.cpp index 7e1e367b57..2e69e29da5 100644 --- a/unit_tests/os_interface/mock_performance_counters.cpp +++ b/unit_tests/os_interface/mock_performance_counters.cpp @@ -9,7 +9,7 @@ #include "runtime/os_interface/os_interface.h" -namespace OCLRT { +namespace NEO { MockPerformanceCounters::MockPerformanceCounters(OSTime *osTime) : PerformanceCounters(osTime) { autoSamplingStartFunc = autoSamplingStart; @@ -144,4 +144,4 @@ void PerformanceCountersFixture::SetUp() { fillOsInterface(); PerfCounterFlags::resetPerfCountersFlags(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/mock_performance_counters.h b/unit_tests/os_interface/mock_performance_counters.h index 329d9dbbaf..7420705b92 100644 --- a/unit_tests/os_interface/mock_performance_counters.h +++ b/unit_tests/os_interface/mock_performance_counters.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "unit_tests/libult/create_command_stream.h" -namespace OCLRT { +namespace NEO { class OSInterface; bool hwMetricsEnableFuncPassing(InstrEscCbData cbData, bool enable); @@ -146,4 +146,4 @@ struct PerformanceCountersFixture { std::unique_ptr osTimeBase; std::unique_ptr performanceCountersBase; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/os_interface_tests.cpp b/unit_tests/os_interface/os_interface_tests.cpp index 57adffd188..714b894d27 100644 --- a/unit_tests/os_interface/os_interface_tests.cpp +++ b/unit_tests/os_interface/os_interface_tests.cpp @@ -12,11 +12,11 @@ #include TEST(OSInterface, NonCopyable) { - EXPECT_FALSE(std::is_move_constructible::value); - EXPECT_FALSE(std::is_copy_constructible::value); + EXPECT_FALSE(std::is_move_constructible::value); + EXPECT_FALSE(std::is_copy_constructible::value); } TEST(OSInterface, NonAssignable) { - EXPECT_FALSE(std::is_move_assignable::value); - EXPECT_FALSE(std::is_copy_assignable::value); + EXPECT_FALSE(std::is_move_assignable::value); + EXPECT_FALSE(std::is_copy_assignable::value); } diff --git a/unit_tests/os_interface/os_library_tests.cpp b/unit_tests/os_interface/os_library_tests.cpp index 4901cbeab6..95643f5db1 100644 --- a/unit_tests/os_interface/os_library_tests.cpp +++ b/unit_tests/os_interface/os_library_tests.cpp @@ -27,7 +27,7 @@ extern const char *testDllName; const std::string fakeLibName = "_fake_library_name_"; const std::string fnName = "testDynamicLibraryFunc"; -using namespace OCLRT; +using namespace NEO; class OSLibraryFixture : public MemoryManagementFixture diff --git a/unit_tests/os_interface/performance_counters_gen_tests.cpp b/unit_tests/os_interface/performance_counters_gen_tests.cpp index f97e1497b6..3e53630035 100644 --- a/unit_tests/os_interface/performance_counters_gen_tests.cpp +++ b/unit_tests/os_interface/performance_counters_gen_tests.cpp @@ -12,15 +12,15 @@ #include "unit_tests/mocks/mock_ostime.h" #include "unit_tests/os_interface/mock_performance_counters.h" -using namespace OCLRT; +using namespace NEO; struct PerformanceCountersGenTest : public ::testing::Test { }; -namespace OCLRT { +namespace NEO { extern decltype(&instrGetPerfCountersQueryData) getPerfCountersQueryDataFactory[IGFX_MAX_CORE]; extern size_t perfCountersQuerySize[IGFX_MAX_CORE]; -} // namespace OCLRT +} // namespace NEO class MockPerformanceCountersGen : public PerformanceCounters { public: diff --git a/unit_tests/os_interface/performance_counters_tests.cpp b/unit_tests/os_interface/performance_counters_tests.cpp index ea739ae666..a9bc7fe3c3 100644 --- a/unit_tests/os_interface/performance_counters_tests.cpp +++ b/unit_tests/os_interface/performance_counters_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct PerformanceCountersDeviceTest : public PerformanceCountersDeviceFixture, public DeviceInstrumentationFixture, diff --git a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp index ac81638491..57c213f03e 100644 --- a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp +++ b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp @@ -12,7 +12,7 @@ #include "runtime/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/libult/create_command_stream.h" -namespace OCLRT { +namespace NEO { bool overrideMemoryManagerCreation = true; std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { @@ -21,4 +21,4 @@ std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvir } return std::make_unique(executionEnvironment); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp b/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp index f6ff1392b0..e8756f026e 100644 --- a/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp +++ b/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(DeferrableDeletionImpl, NonCopyable) { EXPECT_FALSE(std::is_move_constructible::value); diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index e8705ebcaa..71fe3a2893 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -42,7 +42,7 @@ #include "unit_tests/os_interface/windows/mock_wddm_memory_manager.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; class WddmCommandStreamFixture { diff --git a/unit_tests/os_interface/windows/device_os_tests.cpp b/unit_tests/os_interface/windows/device_os_tests.cpp index 18e2deff49..924e9c5c02 100644 --- a/unit_tests/os_interface/windows/device_os_tests.cpp +++ b/unit_tests/os_interface/windows/device_os_tests.cpp @@ -16,7 +16,7 @@ using namespace ::testing; -namespace OCLRT { +namespace NEO { TEST(DeviceOsTest, osSpecificExtensions) { auto hwInfo = *platformDevices; auto pDevice = MockDevice::createWithNewExecutionEnvironment(hwInfo); @@ -66,4 +66,4 @@ TEST(DeviceOsTest, DeviceCreationFailMidThreadPreemption) { EXPECT_THAT(pDevice, nullptr); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/unit_tests/os_interface/windows/driver_info_tests.cpp index d717c82402..0ca5352287 100644 --- a/unit_tests/os_interface/windows/driver_info_tests.cpp +++ b/unit_tests/os_interface/windows/driver_info_tests.cpp @@ -23,7 +23,7 @@ #include -namespace OCLRT { +namespace NEO { extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE]; @@ -164,4 +164,4 @@ TEST(DriverInfo, givenInitializedOsInterfaceWhenCreateDriverInfoWindowsThenSetRe EXPECT_STREQ(driverInfo->getRegistryReaderRegKey(), reader->getRegKey()); }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/gdi_dll_fixture.h b/unit_tests/os_interface/windows/gdi_dll_fixture.h index 53aa2cb1b5..235973ed75 100644 --- a/unit_tests/os_interface/windows/gdi_dll_fixture.h +++ b/unit_tests/os_interface/windows/gdi_dll_fixture.h @@ -11,7 +11,7 @@ #include "runtime/os_interface/os_library.h" #include "unit_tests/mock_gdi/mock_gdi.h" -using namespace OCLRT; +using namespace NEO; OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace); diff --git a/unit_tests/os_interface/windows/gdi_interface_tests.cpp b/unit_tests/os_interface/windows/gdi_interface_tests.cpp index 9e746dfa87..099babeacf 100644 --- a/unit_tests/os_interface/windows/gdi_interface_tests.cpp +++ b/unit_tests/os_interface/windows/gdi_interface_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" TEST(GdiInterface, creation) { - OCLRT::Gdi gdi; + NEO::Gdi gdi; ASSERT_TRUE(gdi.isInitialized()); } @@ -22,7 +22,7 @@ TEST(GdiInterface, failLoad) { const char *oldName = Os::gdiDllName; Os::gdiDllName = "surely_not_exists_.dll"; - OCLRT::Gdi gdi; + NEO::Gdi gdi; EXPECT_FALSE(gdi.isInitialized()); Os::gdiDllName = oldName; @@ -36,14 +36,14 @@ TEST(GdiInterface, givenGdiOverridePathWhenGdiInterfaceIsCalledThenOverridePathI Os::gdiDllName = "surely_not_exists_.dll"; DebugManager.flags.OverrideGdiPath.set(oldName); - OCLRT::Gdi gdi; + NEO::Gdi gdi; EXPECT_TRUE(gdi.isInitialized()); Os::gdiDllName = oldName; } TEST(ThkWrapperTest, givenThkWrapperWhenConstructedThenmFuncIsInitialized) { - OCLRT::ThkWrapper wrapper; + NEO::ThkWrapper wrapper; EXPECT_EQ(nullptr, wrapper.mFunc); } #endif diff --git a/unit_tests/os_interface/windows/gl/gl_dll_helper.h b/unit_tests/os_interface/windows/gl/gl_dll_helper.h index 5bb42a9a54..24b82a945f 100644 --- a/unit_tests/os_interface/windows/gl/gl_dll_helper.h +++ b/unit_tests/os_interface/windows/gl/gl_dll_helper.h @@ -11,11 +11,11 @@ #include "Gl/gl.h" -using namespace OCLRT; +using namespace NEO; namespace Os { extern const char *openglDllName; } -namespace OCLRT { +namespace NEO { struct GLMockReturnedValues; } diff --git a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp index 11fc2da0b3..2e0046cd1e 100644 --- a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp +++ b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp @@ -19,7 +19,7 @@ #include "gtest/gtest.h" #include -using namespace OCLRT; +using namespace NEO; struct MockOSInterfaceImpl : OSInterface::OSInterfaceImpl { HANDLE createEvent(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, diff --git a/unit_tests/os_interface/windows/gmm_memory_tests.cpp b/unit_tests/os_interface/windows/gmm_memory_tests.cpp index b77695a079..4abd400a9c 100644 --- a/unit_tests/os_interface/windows/gmm_memory_tests.cpp +++ b/unit_tests/os_interface/windows/gmm_memory_tests.cpp @@ -12,7 +12,7 @@ #include "gmm_memory.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class PublicGmmMemory : public GmmMemory { public: using GmmMemory::clientContext; diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp index 82343dd773..9f125b733d 100644 --- a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp +++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp @@ -12,7 +12,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/libult/mock_gfx_family.h" -namespace OCLRT { +namespace NEO { template <> int HwInfoConfigHw::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) { @@ -65,4 +65,4 @@ TEST_F(HwInfoConfigTestWindows, givenInstrumentationForHardwareIsEnabledOrDisabl EXPECT_TRUE(outHwInfo.capabilityTable.instrumentationEnabled == haveInstrumentation); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.h b/unit_tests/os_interface/windows/hw_info_config_win_tests.h index 8d0327cce7..45b39c4a69 100644 --- a/unit_tests/os_interface/windows/hw_info_config_win_tests.h +++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,7 +12,7 @@ #include -namespace OCLRT { +namespace NEO { struct DummyHwConfig : HwInfoConfigHw { }; @@ -26,4 +26,4 @@ struct HwInfoConfigTestWindows : public HwInfoConfigTest { DummyHwConfig hwConfig; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_gdi_interface.h b/unit_tests/os_interface/windows/mock_gdi_interface.h index ee3e93da4d..7b3532542c 100644 --- a/unit_tests/os_interface/windows/mock_gdi_interface.h +++ b/unit_tests/os_interface/windows/mock_gdi_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/windows/gdi_interface.h" -namespace OCLRT { +namespace NEO { class MockGdi : public Gdi { public: @@ -158,4 +158,4 @@ class MockGdi : public Gdi { } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_kmdaf_listener.h b/unit_tests/os_interface/windows/mock_kmdaf_listener.h index 71162663de..d0ad68495a 100644 --- a/unit_tests/os_interface/windows/mock_kmdaf_listener.h +++ b/unit_tests/os_interface/windows/mock_kmdaf_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/windows/kmdaf_listener.h" -namespace OCLRT { +namespace NEO { struct KmDafListenerMock : public KmDafListener { @@ -134,4 +134,4 @@ struct KmDafListenerMock : public KmDafListener { PFND3DKMT_ESCAPE pfnEscape = nullptr; } notifyWriteTargetParametrization; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_os_time_win.h b/unit_tests/os_interface/windows/mock_os_time_win.h index bdb43eef2c..5762c7da55 100644 --- a/unit_tests/os_interface/windows/mock_os_time_win.h +++ b/unit_tests/os_interface/windows/mock_os_time_win.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/windows/os_time_win.h" -namespace OCLRT { +namespace NEO { class MockOSTimeWin : public OSTimeWin { public: MockOSTimeWin(OSInterface *osInterface) : OSTimeWin(osInterface){}; @@ -21,4 +21,4 @@ class MockOSTimeWin : public OSTimeWin { this->frequency = frequency; } }; -} // namespace OCLRT \ No newline at end of file +} // namespace NEO \ No newline at end of file diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp index e182995b0b..5c0822cd0d 100644 --- a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp +++ b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp @@ -10,7 +10,7 @@ #include "runtime/os_interface/windows/windows_wrapper.h" #include "unit_tests/mocks/mock_wddm.h" -namespace OCLRT { +namespace NEO { MockPerformanceCountersWin::MockPerformanceCountersWin(OSTime *osTime) : PerformanceCounters(osTime), PerformanceCountersWin(osTime), MockPerformanceCounters(osTime) { setAvailableFunc = setAvailable; @@ -50,4 +50,4 @@ void PerformanceCountersFixture::fillOsInterface() { } void PerformanceCountersFixture::releaseOsInterface() { } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.h b/unit_tests/os_interface/windows/mock_performance_counters_win.h index 15c953c56f..208aefb20d 100644 --- a/unit_tests/os_interface/windows/mock_performance_counters_win.h +++ b/unit_tests/os_interface/windows/mock_performance_counters_win.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,7 +10,7 @@ #include "unit_tests/os_interface/mock_performance_counters.h" #include "unit_tests/os_interface/windows/mock_os_time_win.h" -namespace OCLRT { +namespace NEO { bool setAvailable(bool value); void verifyEnable(InstrEscCbData cbData); @@ -34,4 +34,4 @@ class MockPerformanceCountersWin : public PerformanceCountersWin, return PerformanceCountersWin::initialize(hwInfo); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_wddm_allocation.h b/unit_tests/os_interface/windows/mock_wddm_allocation.h index 4f5a56a750..f801e51f0e 100644 --- a/unit_tests/os_interface/windows/mock_wddm_allocation.h +++ b/unit_tests/os_interface/windows/mock_wddm_allocation.h @@ -8,7 +8,7 @@ #pragma once #include "runtime/os_interface/windows/wddm_allocation.h" -namespace OCLRT { +namespace NEO { class MockWddmAllocation : public WddmAllocation { public: @@ -22,4 +22,4 @@ class MockWddmAllocation : public WddmAllocation { D3DKMT_HANDLE &handle; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h index 84c583db80..d131d74cae 100644 --- a/unit_tests/os_interface/windows/mock_wddm_memory_manager.h +++ b/unit_tests/os_interface/windows/mock_wddm_memory_manager.h @@ -11,7 +11,7 @@ #include "unit_tests/mocks/mock_host_ptr_manager.h" #include "unit_tests/mocks/mock_memory_manager.h" -namespace OCLRT { +namespace NEO { class MockWddmMemoryManager : public MemoryManagerCreate { using BaseClass = WddmMemoryManager; @@ -50,4 +50,4 @@ class MockWddmMemoryManager : public MemoryManagerCreate { uint32_t freeGraphicsMemoryImplCalled = 0u; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/options.cpp b/unit_tests/os_interface/windows/options.cpp index dbea48dd9c..0c8f15a4c5 100644 --- a/unit_tests/os_interface/windows/options.cpp +++ b/unit_tests/os_interface/windows/options.cpp @@ -23,9 +23,9 @@ const char *gmmEntryName = "openMockGmm"; const char *testDllName = "test_dynamic_lib.dll"; } // namespace Os -OCLRT::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace) { - OCLRT::OsLibrary *mockGdiDll; - mockGdiDll = OCLRT::OsLibrary::load("gdi32_mock.dll"); +NEO::OsLibrary *setAdapterInfo(const PLATFORM *platform, const GT_SYSTEM_INFO *gtSystemInfo, uint64_t gpuAddressSpace) { + NEO::OsLibrary *mockGdiDll; + mockGdiDll = NEO::OsLibrary::load("gdi32_mock.dll"); typedef void(__stdcall * pfSetAdapterInfo)(const void *, const void *, uint64_t); pfSetAdapterInfo setAdpaterInfo = reinterpret_cast(mockGdiDll->getProcAddress("MockSetAdapterInfo")); diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.h b/unit_tests/os_interface/windows/os_interface_win_tests.h index 695e6a3b3c..320c1160c2 100644 --- a/unit_tests/os_interface/windows/os_interface_win_tests.h +++ b/unit_tests/os_interface/windows/os_interface_win_tests.h @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class OsInterfaceTest : public ::testing::Test { public: diff --git a/unit_tests/os_interface/windows/os_library_win_tests.cpp b/unit_tests/os_interface/windows/os_library_win_tests.cpp index 4b4002c773..12f3f4ff45 100644 --- a/unit_tests/os_interface/windows/os_library_win_tests.cpp +++ b/unit_tests/os_interface/windows/os_library_win_tests.cpp @@ -17,7 +17,7 @@ namespace Os { extern const char *testDllName; } -using namespace OCLRT; +using namespace NEO; class OsLibraryBackup : public Windows::OsLibrary { using Type = decltype(Windows::OsLibrary::loadLibraryExA); diff --git a/unit_tests/os_interface/windows/os_time_win_tests.cpp b/unit_tests/os_interface/windows/os_time_win_tests.cpp index 321c82a719..10ddc15830 100644 --- a/unit_tests/os_interface/windows/os_time_win_tests.cpp +++ b/unit_tests/os_interface/windows/os_time_win_tests.cpp @@ -13,7 +13,7 @@ #include -using namespace OCLRT; +using namespace NEO; LARGE_INTEGER valueToSet = {0}; diff --git a/unit_tests/os_interface/windows/performance_counters_win_tests.cpp b/unit_tests/os_interface/windows/performance_counters_win_tests.cpp index 6aef2298c6..5ccc94bba4 100644 --- a/unit_tests/os_interface/windows/performance_counters_win_tests.cpp +++ b/unit_tests/os_interface/windows/performance_counters_win_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct PerformanceCountersWinTest : public PerformanceCountersFixture, public ::testing::Test { diff --git a/unit_tests/os_interface/windows/registry_reader_tests.cpp b/unit_tests/os_interface/windows/registry_reader_tests.cpp index 5a15514313..89e6255be3 100644 --- a/unit_tests/os_interface/windows/registry_reader_tests.cpp +++ b/unit_tests/os_interface/windows/registry_reader_tests.cpp @@ -9,7 +9,7 @@ #include "test.h" -using namespace OCLRT; +using namespace NEO; using RegistryReaderTest = ::testing::Test; diff --git a/unit_tests/os_interface/windows/registry_reader_tests.h b/unit_tests/os_interface/windows/registry_reader_tests.h index 80951f3bf6..fb8d9c12dc 100644 --- a/unit_tests/os_interface/windows/registry_reader_tests.h +++ b/unit_tests/os_interface/windows/registry_reader_tests.h @@ -5,7 +5,7 @@ * */ -using namespace OCLRT; +using namespace NEO; #include "runtime/os_interface/windows/registry_reader.h" diff --git a/unit_tests/os_interface/windows/sys_calls.cpp b/unit_tests/os_interface/windows/sys_calls.cpp index 55c0cf616b..4aa953d9ad 100644 --- a/unit_tests/os_interface/windows/sys_calls.cpp +++ b/unit_tests/os_interface/windows/sys_calls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "sys_calls.h" -namespace OCLRT { +namespace NEO { namespace SysCalls { @@ -31,4 +31,4 @@ BOOL getSystemPowerStatus(LPSYSTEM_POWER_STATUS systemPowerStatusPtr) { } // namespace SysCalls -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/ult_dxgi_factory.cpp b/unit_tests/os_interface/windows/ult_dxgi_factory.cpp index 0853abbbd9..98ddc8d8e2 100644 --- a/unit_tests/os_interface/windows/ult_dxgi_factory.cpp +++ b/unit_tests/os_interface/windows/ult_dxgi_factory.cpp @@ -7,7 +7,7 @@ #include "unit_tests/os_interface/windows/ult_dxgi_factory.h" -namespace OCLRT { +namespace NEO { HRESULT WINAPI ULTCreateDXGIFactory(REFIID riid, void **ppFactory) { @@ -22,4 +22,4 @@ void WINAPI ULTGetSystemInfo(SYSTEM_INFO *pSystemInfo) { pSystemInfo->lpMaximumApplicationAddress = is32bit ? (LPVOID)MemoryConstants::max32BitAppAddress : (LPVOID)MemoryConstants::max64BitAppAddress; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/ult_dxgi_factory.h b/unit_tests/os_interface/windows/ult_dxgi_factory.h index eabb01b456..97848aa983 100644 --- a/unit_tests/os_interface/windows/ult_dxgi_factory.h +++ b/unit_tests/os_interface/windows/ult_dxgi_factory.h @@ -12,7 +12,7 @@ #include #include -namespace OCLRT { +namespace NEO { class UltIDXGIAdapter1 : public IDXGIAdapter1 { public: // IDXGIAdapter1 @@ -186,4 +186,4 @@ class UltIDXGIFactory1 : public IDXGIFactory1 { HRESULT WINAPI ULTCreateDXGIFactory(REFIID riid, void **ppFactory); void WINAPI ULTGetSystemInfo(SYSTEM_INFO *pSystemInfo); -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index ec9f75fbfd..7a0f34ed2d 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -31,7 +31,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; namespace GmmHelperFunctions { Gmm *getGmm(void *ptr, size_t size) { @@ -58,7 +58,7 @@ struct Wddm20WithMockGdiDllTests : public Wddm20WithMockGdiDllTestsWithoutWddmIn TEST_F(Wddm20Tests, givenMinWindowsAddressWhenWddmIsInitializedThenWddmUseThisAddress) { uintptr_t expectedAddress = 0x200000; - EXPECT_EQ(expectedAddress, OCLRT::windowsMinAddress); + EXPECT_EQ(expectedAddress, NEO::windowsMinAddress); EXPECT_EQ(expectedAddress, wddm->getWddmMinAddress()); } diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp index 390d11d859..3f6d7c6f89 100644 --- a/unit_tests/os_interface/windows/wddm23_tests.cpp +++ b/unit_tests/os_interface/windows/wddm23_tests.cpp @@ -18,7 +18,7 @@ #include "unit_tests/mocks/mock_wddm_interface23.h" #include "unit_tests/os_interface/windows/gdi_dll_fixture.h" -using namespace OCLRT; +using namespace NEO; struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture { void SetUp() override { diff --git a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp b/unit_tests/os_interface/windows/wddm_address_space_tests.cpp index 201f65e5da..562c76d7e2 100644 --- a/unit_tests/os_interface/windows/wddm_address_space_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_address_space_tests.cpp @@ -10,7 +10,7 @@ #include "test.h" #include "unit_tests/mocks/mock_wddm.h" -using namespace OCLRT; +using namespace NEO; class WddmMockReserveAddress : public WddmMock { public: diff --git a/unit_tests/os_interface/windows/wddm_calls.cpp b/unit_tests/os_interface/windows/wddm_calls.cpp index 397732ff59..f038228f78 100644 --- a/unit_tests/os_interface/windows/wddm_calls.cpp +++ b/unit_tests/os_interface/windows/wddm_calls.cpp @@ -9,7 +9,7 @@ #include "unit_tests/mocks/mock_wddm.h" #include "unit_tests/os_interface/windows/ult_dxgi_factory.h" -namespace OCLRT { +namespace NEO { BOOL WINAPI ULTVirtualFree(LPVOID ptr, SIZE_T size, DWORD flags) { free(ptr); @@ -35,4 +35,4 @@ Wddm::VirtualFreeFcn getVirtualFree() { Wddm::VirtualAllocFcn getVirtualAlloc() { return ULTVirtualAlloc; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/wddm_create.cpp b/unit_tests/os_interface/windows/wddm_create.cpp index 96483382cf..80e97cdf4b 100644 --- a/unit_tests/os_interface/windows/wddm_create.cpp +++ b/unit_tests/os_interface/windows/wddm_create.cpp @@ -7,8 +7,8 @@ #include "unit_tests/mocks/mock_wddm.h" -namespace OCLRT { +namespace NEO { Wddm *Wddm::createWddm() { return new WddmMock(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h index d8fecf602c..681263b7a6 100644 --- a/unit_tests/os_interface/windows/wddm_fixture.h +++ b/unit_tests/os_interface/windows/wddm_fixture.h @@ -21,7 +21,7 @@ #include "mock_gmm_memory.h" -namespace OCLRT { +namespace NEO { struct WddmFixture : ::testing::Test { void SetUp() { executionEnvironment = platformImpl->peekExecutionEnvironment(); @@ -91,4 +91,4 @@ using WddmTest = WddmFixture; using WddmTestWithMockGdiDll = Test; using WddmInstrumentationTest = Test; using WddmTestSingle = ::testing::Test; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 0edf3fe6ef..51404dd949 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -18,7 +18,7 @@ #include "unit_tests/os_interface/windows/mock_kmdaf_listener.h" #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" -using namespace OCLRT; +using namespace NEO; class WddmWithKmDafMock : public Wddm { public: diff --git a/unit_tests/os_interface/windows/wddm_mapper_tests.cpp b/unit_tests/os_interface/windows/wddm_mapper_tests.cpp index c3415cf884..58af70a9cd 100644 --- a/unit_tests/os_interface/windows/wddm_mapper_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_mapper_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/wddm_engine_mapper.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(WddmMapperTests, givenRcsEngineTypeWhenAskedForNodeOrdinalThenReturn3d) { GPUNODE_ORDINAL gpuNode = WddmEngineMapper::engineNodeMap(EngineType::ENGINE_RCS); diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl b/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl index 537c3940e2..eb4636ae06 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl +++ b/unit_tests/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl @@ -10,7 +10,7 @@ #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; TEST_F(WddmMemoryManagerSimpleTest, givenUseSystemMemorySetToTrueWhenAllocateInDevicePoolIsCalledThenNullptrIsReturned) { diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index 1839f1d1d1..04471c1558 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -27,7 +27,7 @@ #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" #include "unit_tests/utilities/base_object_utils.h" -using namespace OCLRT; +using namespace NEO; using namespace ::testing; void WddmMemoryManagerFixture::SetUp() { @@ -906,7 +906,7 @@ TEST_F(WddmMemoryManagerTest, freeNullAllocationNoCrash) { TEST_F(WddmMemoryManagerTest, givenDefaultWddmMemoryManagerWhenAskedForAlignedMallocRestrictionsThenValueIsReturned) { AlignedMallocRestrictions *mallocRestrictions = memoryManager->getAlignedMallocRestrictions(); ASSERT_NE(nullptr, mallocRestrictions); - EXPECT_EQ(OCLRT::windowsMinAddress, mallocRestrictions->minAddress); + EXPECT_EQ(NEO::windowsMinAddress, mallocRestrictions->minAddress); } TEST_F(WddmMemoryManagerTest, givenWddmMemoryManagerWhenCpuMemNotMeetRestrictionsThenReserveMemRangeForMap) { diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h index ada191c7a4..3144dfb71f 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h @@ -22,7 +22,7 @@ #include -using namespace OCLRT; +using namespace NEO; using namespace ::testing; class WddmMemoryManagerFixture : public GdiDllFixture { diff --git a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp index 2ed4a27f3f..edecae3b91 100644 --- a/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -11,7 +11,7 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" -using namespace OCLRT; +using namespace NEO; class WddmPreemptionTests : public Test { public: diff --git a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp index e275dba9a1..eb03ad9e7f 100644 --- a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp @@ -26,7 +26,7 @@ #include -using namespace OCLRT; +using namespace NEO; class MockWddmResidencyController : public WddmResidencyController { public: diff --git a/unit_tests/perf_tests/api/api_tests.cpp b/unit_tests/perf_tests/api/api_tests.cpp index 8cd68b7d6c..99d01933b2 100644 --- a/unit_tests/perf_tests/api/api_tests.cpp +++ b/unit_tests/perf_tests/api/api_tests.cpp @@ -12,7 +12,7 @@ #include "cl_api_tests.h" -namespace OCLRT { +namespace NEO { api_fixture::api_fixture() : retVal(CL_SUCCESS), @@ -44,4 +44,4 @@ void api_fixture::TearDown() { DeviceFixture::TearDown(); PlatformFixture::TearDown(); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/api/api_tests.h b/unit_tests/perf_tests/api/api_tests.h index 4d6fd0ecbd..8b30feccde 100644 --- a/unit_tests/perf_tests/api/api_tests.h +++ b/unit_tests/perf_tests/api/api_tests.h @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { struct api_fixture : public PlatformFixture, public CommandQueueHwFixture, @@ -46,4 +46,4 @@ struct api_tests : public api_fixture, api_fixture::TearDown(); } }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/api/context_tests.cpp b/unit_tests/perf_tests/api/context_tests.cpp index eb363c6110..36bbf1560c 100644 --- a/unit_tests/perf_tests/api/context_tests.cpp +++ b/unit_tests/perf_tests/api/context_tests.cpp @@ -13,7 +13,7 @@ #include "cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests ContextTest; diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp index ce31239368..9402466143 100644 --- a/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp +++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" #include "hw_cmds.h" -namespace OCLRT { +namespace NEO { // Global table of create functions extern CommandQueueCreateFunc commandQueueFactory[IGFX_MAX_CORE]; @@ -77,4 +77,4 @@ void CommandQueueFixture::TearDown() { delete pCmdQ; pCmdQ = nullptr; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/fixtures/command_queue_fixture.h b/unit_tests/perf_tests/fixtures/command_queue_fixture.h index 3de5aec5eb..bdd3884e44 100644 --- a/unit_tests/perf_tests/fixtures/command_queue_fixture.h +++ b/unit_tests/perf_tests/fixtures/command_queue_fixture.h @@ -11,7 +11,7 @@ #include "CL/cl.h" #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class Context; class Device; @@ -53,4 +53,4 @@ static const cl_command_queue_properties DefaultCommandQueueProperties[] = { 0, CL_QUEUE_PROFILING_ENABLE, }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/fixtures/device_fixture.cpp b/unit_tests/perf_tests/fixtures/device_fixture.cpp index aee3deb3c6..76591b082a 100644 --- a/unit_tests/perf_tests/fixtures/device_fixture.cpp +++ b/unit_tests/perf_tests/fixtures/device_fixture.cpp @@ -12,9 +12,9 @@ #include "gtest/gtest.h" -using OCLRT::Device; -using OCLRT::HardwareInfo; -using OCLRT::platformDevices; +using NEO::Device; +using NEO::HardwareInfo; +using NEO::platformDevices; void DeviceFixture::SetUp() { pDevice = DeviceHelper<>::create(); diff --git a/unit_tests/perf_tests/fixtures/device_fixture.h b/unit_tests/perf_tests/fixtures/device_fixture.h index c70111d5df..122f292863 100644 --- a/unit_tests/perf_tests/fixtures/device_fixture.h +++ b/unit_tests/perf_tests/fixtures/device_fixture.h @@ -10,10 +10,10 @@ #include -namespace OCLRT { +namespace NEO { struct HardwareInfo; extern const HardwareInfo **platformDevices; -} // namespace OCLRT +} // namespace NEO // Even though there aren't any defaults, this pattern is used // throughout testing. Included here for consistency. @@ -22,8 +22,8 @@ struct DeviceDefaults { template struct DeviceHelper { - static OCLRT::Device *create(const OCLRT::HardwareInfo *hardwareInfo = nullptr) { - auto device = OCLRT::Device::create(hardwareInfo); + static NEO::Device *create(const NEO::HardwareInfo *hardwareInfo = nullptr) { + auto device = NEO::Device::create(hardwareInfo); assert(device != nullptr); return device; } @@ -38,6 +38,6 @@ struct DeviceFixture { void SetUp(); void TearDown(); - OCLRT::Device *pDevice; + NEO::Device *pDevice; volatile uint32_t *pTagMemory; }; diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.cpp b/unit_tests/perf_tests/fixtures/platform_fixture.cpp index 0db7ec151f..caf67de9f4 100644 --- a/unit_tests/perf_tests/fixtures/platform_fixture.cpp +++ b/unit_tests/perf_tests/fixtures/platform_fixture.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { PlatformFixture::PlatformFixture() : pPlatform(nullptr), num_devices(0), devices(nullptr) @@ -45,4 +45,4 @@ void PlatformFixture::TearDown() { pPlatform->shutdown(); delete[] devices; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/fixtures/platform_fixture.h b/unit_tests/perf_tests/fixtures/platform_fixture.h index dcc86ba8b6..2dbd5e6216 100644 --- a/unit_tests/perf_tests/fixtures/platform_fixture.h +++ b/unit_tests/perf_tests/fixtures/platform_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/api/cl_types.h" #include "runtime/platform/platform.h" -namespace OCLRT { +namespace NEO { struct HardwareInfo; @@ -30,4 +30,4 @@ class PlatformFixture { cl_uint num_devices; cl_device_id *devices; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/perf_tests/options.cpp b/unit_tests/perf_tests/options.cpp index 9e125a1888..e1b209c42a 100644 --- a/unit_tests/perf_tests/options.cpp +++ b/unit_tests/perf_tests/options.cpp @@ -10,7 +10,7 @@ #include "hw_cmds.h" #include "hw_info.h" -namespace OCLRT { +namespace NEO { // IP address for TBX server const char *tbxServerIp = "127.0.0.1"; @@ -28,6 +28,6 @@ static const HardwareInfo *DefaultPlatformDevices[] = { size_t numPlatformDevices = ARRAY_COUNT(DefaultPlatformDevices); const HardwareInfo **platformDevices = DefaultPlatformDevices; -} // namespace OCLRT +} // namespace NEO bool printMemoryOpCallStack = true; diff --git a/unit_tests/perf_tests/perf_test_utils.cpp b/unit_tests/perf_tests/perf_test_utils.cpp index a787c31f1e..602858877c 100644 --- a/unit_tests/perf_tests/perf_test_utils.cpp +++ b/unit_tests/perf_tests/perf_test_utils.cpp @@ -13,7 +13,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; const char *perfLogPath = "perf_logs/"; diff --git a/unit_tests/platform/platform_icd_tests.cpp b/unit_tests/platform/platform_icd_tests.cpp index ca0023aa05..800d0e82c9 100644 --- a/unit_tests/platform/platform_icd_tests.cpp +++ b/unit_tests/platform/platform_icd_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class IcdRestore : public SharingFactory { public: diff --git a/unit_tests/platform/platform_negative_tests.cpp b/unit_tests/platform/platform_negative_tests.cpp index e2659cea21..2d2e315d2f 100644 --- a/unit_tests/platform/platform_negative_tests.cpp +++ b/unit_tests/platform/platform_negative_tests.cpp @@ -10,11 +10,11 @@ #include "test.h" #include "unit_tests/helpers/variable_backup.h" -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { extern bool getDevicesResult; -}; // namespace OCLRT +}; // namespace NEO struct PlatformNegativeTest : public ::testing::Test { void SetUp() override { diff --git a/unit_tests/platform/platform_tests.cpp b/unit_tests/platform/platform_tests.cpp index 125f200aeb..7106b1d08e 100644 --- a/unit_tests/platform/platform_tests.cpp +++ b/unit_tests/platform/platform_tests.cpp @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct PlatformTest : public ::testing::Test { void SetUp() override { pPlatform.reset(new Platform()); } @@ -173,7 +173,7 @@ TEST(PlatformTestSimple, shutdownClosesAsyncEventHandlerThread) { EXPECT_TRUE(MockAsyncEventHandlerGlobals::destructorCalled); } -namespace OCLRT { +namespace NEO { extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE]; } diff --git a/unit_tests/platform/platform_tests_mt.cpp b/unit_tests/platform/platform_tests_mt.cpp index af274302eb..6363a18666 100644 --- a/unit_tests/platform/platform_tests_mt.cpp +++ b/unit_tests/platform/platform_tests_mt.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct PlatformTestMt : public ::testing::Test { void SetUp() override { pPlatform.reset(new Platform); } diff --git a/unit_tests/preamble/preamble_fixture.h b/unit_tests/preamble/preamble_fixture.h index 6d65d2a411..986919ae67 100644 --- a/unit_tests/preamble/preamble_fixture.h +++ b/unit_tests/preamble/preamble_fixture.h @@ -13,7 +13,7 @@ #include "unit_tests/fixtures/platform_fixture.h" #include "unit_tests/helpers/hw_parse.h" -using namespace OCLRT; +using namespace NEO; struct PreambleFixture : public DeviceFixture, public LinearStreamFixture, diff --git a/unit_tests/preamble/preamble_tests.cpp b/unit_tests/preamble/preamble_tests.cpp index 09896432c2..7766f9fe99 100644 --- a/unit_tests/preamble/preamble_tests.cpp +++ b/unit_tests/preamble/preamble_tests.cpp @@ -20,7 +20,7 @@ using PreambleTest = ::testing::Test; -using namespace OCLRT; +using namespace NEO; HWTEST_F(PreambleTest, givenDisabledPreemptioWhenPreambleAdditionalCommandsSizeIsQueriedThenZeroIsReturned) { auto mockDevice = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(nullptr)); diff --git a/unit_tests/preemption/preemption_tests.cpp b/unit_tests/preemption/preemption_tests.cpp index 51dfd050e0..b34169428e 100644 --- a/unit_tests/preemption/preemption_tests.cpp +++ b/unit_tests/preemption/preemption_tests.cpp @@ -20,7 +20,7 @@ #include "gmock/gmock.h" -using namespace OCLRT; +using namespace NEO; class ThreadGroupPreemptionTests : public DevicePreemptionTests { void SetUp() override { @@ -310,7 +310,7 @@ HWTEST_P(PreemptionHwTest, getRequiredCmdStreamSizeReturns0WhenPreemptionModeIsN { auto builtIns = new MockBuiltins(); - builtIns->overrideSipKernel(std::unique_ptr(new OCLRT::SipKernel{SipKernelType::Csr, GlobalMockSipProgram::getSipProgramWithCustomBinary()})); + builtIns->overrideSipKernel(std::unique_ptr(new NEO::SipKernel{SipKernelType::Csr, GlobalMockSipProgram::getSipProgramWithCustomBinary()})); mockDevice->getExecutionEnvironment()->builtins.reset(builtIns); PreemptionHelper::programCmdStream(cmdStream, mode, mode, nullptr, *mockDevice); diff --git a/unit_tests/profiling/profiling_tests.cpp b/unit_tests/profiling/profiling_tests.cpp index 10b48bb57a..845da4efd8 100644 --- a/unit_tests/profiling/profiling_tests.cpp +++ b/unit_tests/profiling/profiling_tests.cpp @@ -27,7 +27,7 @@ #include "unit_tests/os_interface/mock_performance_counters.h" #include "unit_tests/utilities/base_object_utils.h" -namespace OCLRT { +namespace NEO { struct ProfilingTests : public CommandEnqueueFixture, public ::testing::Test { @@ -271,7 +271,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingTests, GIVENCommandQueueBlockedWithProfilin //rseCommands(*pCmdQ); ASSERT_NE(nullptr, pCmdQ->virtualEvent); ASSERT_NE(nullptr, pCmdQ->virtualEvent->peekCommand()); - OCLRT::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); + NEO::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); ASSERT_NE(nullptr, eventCommandStream); parseCommands(*eventCommandStream); @@ -329,7 +329,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingTests, GIVENCommandQueueBlockedWithProfilin // parseCommands(*pCmdQ); ASSERT_NE(nullptr, pCmdQ->virtualEvent); ASSERT_NE(nullptr, pCmdQ->virtualEvent->peekCommand()); - OCLRT::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); + NEO::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); ASSERT_NE(nullptr, eventCommandStream); parseCommands(*eventCommandStream); @@ -536,9 +536,9 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingWithPerfCountersTests, GIVENCommandQueueWit uint64_t requiredSize = 2 * sizeof(PIPE_CONTROL) + 4 * sizeof(MI_STORE_REGISTER_MEM) + sizeof(GPGPU_WALKER) + KernelCommandsHelper::getSizeRequiredCS(&kernel); //begin perf cmds - requiredSize += 2 * sizeof(PIPE_CONTROL) + 2 * sizeof(MI_STORE_REGISTER_MEM) + OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); + requiredSize += 2 * sizeof(PIPE_CONTROL) + 2 * sizeof(MI_STORE_REGISTER_MEM) + NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); //end perf cmds - requiredSize += 2 * sizeof(PIPE_CONTROL) + 3 * sizeof(MI_STORE_REGISTER_MEM) + OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); + requiredSize += 2 * sizeof(PIPE_CONTROL) + 3 * sizeof(MI_STORE_REGISTER_MEM) + NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); auto &commandStreamNDRangeKernel = getCommandStream(*pCmdQ, true, true, &kernel); auto expectedSizeCS = EnqueueOperation::getSizeRequiredCS(CL_COMMAND_NDRANGE_KERNEL, true, true, *pCmdQ, &kernel); @@ -593,9 +593,9 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingWithPerfCountersTests, GIVENCommandQueueWit requiredSize += 2 * sizeof(GPGPU_WALKER); //begin perf cmds - requiredSize += 2 * sizeof(PIPE_CONTROL) + 2 * sizeof(MI_STORE_REGISTER_MEM) + OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); + requiredSize += 2 * sizeof(PIPE_CONTROL) + 2 * sizeof(MI_STORE_REGISTER_MEM) + NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); //end perf cmds - requiredSize += 2 * sizeof(PIPE_CONTROL) + 3 * sizeof(MI_STORE_REGISTER_MEM) + OCLRT::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); + requiredSize += 2 * sizeof(PIPE_CONTROL) + 3 * sizeof(MI_STORE_REGISTER_MEM) + NEO::INSTR_GENERAL_PURPOSE_COUNTERS_COUNT * sizeof(MI_STORE_REGISTER_MEM) + sizeof(MI_REPORT_PERF_COUNT) + pCmdQ->getPerfCountersUserRegistersNumber() * sizeof(MI_STORE_REGISTER_MEM); DispatchInfo dispatchInfo; dispatchInfo.setKernel(&kernel); @@ -764,7 +764,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ProfilingWithPerfCountersTests, GIVENCommandQueueBlo //rseCommands(*pCmdQ); ASSERT_NE(nullptr, pCmdQ->virtualEvent); ASSERT_NE(nullptr, pCmdQ->virtualEvent->peekCommand()); - OCLRT::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); + NEO::LinearStream *eventCommandStream = pCmdQ->virtualEvent->peekCommand()->getCommandStream(); ASSERT_NE(nullptr, eventCommandStream); parseCommands(*eventCommandStream); @@ -936,4 +936,4 @@ TEST_F(ProfilingTimestampPacketsTest, givenTimestampsPacketContainerWithZeroElem EXPECT_FALSE(ev->getDataCalcStatus()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/program/block_kernel_manager_tests.cpp b/unit_tests/program/block_kernel_manager_tests.cpp index 370b76e103..0ce3bf543d 100644 --- a/unit_tests/program/block_kernel_manager_tests.cpp +++ b/unit_tests/program/block_kernel_manager_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(BlockKernelManagerTest, pushPrivateSurfaceResizesArray) { MockGraphicsAllocation allocation(0, 0); diff --git a/unit_tests/program/evaluate_unhandled_token_tests.cpp b/unit_tests/program/evaluate_unhandled_token_tests.cpp index ab87b66434..47c44c946b 100644 --- a/unit_tests/program/evaluate_unhandled_token_tests.cpp +++ b/unit_tests/program/evaluate_unhandled_token_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; extern GFXCORE_FAMILY renderCoreFamily; @@ -40,15 +40,15 @@ struct MockProgramRecordUnhandledTokens : public Program { inline cl_int GetDecodeErrorCode(const std::vector &binary, bool allowUnhandledTokens, int defaultUnhandledTokenId, int &foundUnhandledTokenId) { - OCLRT::ExecutionEnvironment executionEnvironment; + NEO::ExecutionEnvironment executionEnvironment; using PT = MockProgramRecordUnhandledTokens; std::unique_ptr prog; cl_int errorCode = CL_INVALID_BINARY; - prog.reset(OCLRT::Program::createFromGenBinary(executionEnvironment, - nullptr, - binary.data(), - binary.size(), - false, &errorCode)); + prog.reset(NEO::Program::createFromGenBinary(executionEnvironment, + nullptr, + binary.data(), + binary.size(), + false, &errorCode)); prog->allowUnhandledTokens = allowUnhandledTokens; prog->lastUnhandledTokenFound = defaultUnhandledTokenId; auto ret = prog->processGenBinary(); diff --git a/unit_tests/program/evaluate_unhandled_token_ult.cpp b/unit_tests/program/evaluate_unhandled_token_ult.cpp index cdc29bdf16..ac8dbb63ba 100644 --- a/unit_tests/program/evaluate_unhandled_token_ult.cpp +++ b/unit_tests/program/evaluate_unhandled_token_ult.cpp @@ -1,31 +1,16 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "runtime/program/program.h" -namespace OCLRT { +namespace NEO { bool Program::isSafeToSkipUnhandledToken(unsigned int token) const { return true; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/program/kernel_info_tests.cpp b/unit_tests/program/kernel_info_tests.cpp index edc5575a7b..e947ae4039 100644 --- a/unit_tests/program/kernel_info_tests.cpp +++ b/unit_tests/program/kernel_info_tests.cpp @@ -14,7 +14,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; TEST(KernelInfo, NonCopyable) { EXPECT_FALSE(std::is_move_constructible::value); diff --git a/unit_tests/program/printf_handler_tests.cpp b/unit_tests/program/printf_handler_tests.cpp index d6f7151a4d..0f365cc62f 100644 --- a/unit_tests/program/printf_handler_tests.cpp +++ b/unit_tests/program/printf_handler_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(PrintfHandlerTest, givenNotPreparedPrintfHandlerWhenGetSurfaceIsCalledThenResultIsNullptr) { MockDevice *device = MockDevice::createWithNewExecutionEnvironment(nullptr); diff --git a/unit_tests/program/printf_helper_tests.cpp b/unit_tests/program/printf_helper_tests.cpp index d983fbe24b..9d5802fa28 100644 --- a/unit_tests/program/printf_helper_tests.cpp +++ b/unit_tests/program/printf_helper_tests.cpp @@ -17,7 +17,7 @@ #include -using namespace OCLRT; +using namespace NEO; using namespace iOpenCL; // -------------------- Base Fixture ------------------------ diff --git a/unit_tests/program/process_debug_data_tests.cpp b/unit_tests/program/process_debug_data_tests.cpp index 1cf6661af2..0f57070880 100644 --- a/unit_tests/program/process_debug_data_tests.cpp +++ b/unit_tests/program/process_debug_data_tests.cpp @@ -13,7 +13,7 @@ #include using namespace iOpenCL; -using namespace OCLRT; +using namespace NEO; TEST_F(ProgramTests, GivenProgramWithDebugDataForTwoKernelsWhenPorcessedThenDebugDataIsSetInKernelInfos) { const char kernelName1[] = "kernel1"; diff --git a/unit_tests/program/process_elf_binary_tests.cpp b/unit_tests/program/process_elf_binary_tests.cpp index 1677e934fa..050700dbbf 100644 --- a/unit_tests/program/process_elf_binary_tests.cpp +++ b/unit_tests/program/process_elf_binary_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; class ProcessElfBinaryTests : public ::testing::Test { public: diff --git a/unit_tests/program/process_spir_binary_tests.cpp b/unit_tests/program/process_spir_binary_tests.cpp index 94b9c83492..40943b6f1f 100644 --- a/unit_tests/program/process_spir_binary_tests.cpp +++ b/unit_tests/program/process_spir_binary_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class ProcessSpirBinaryTests : public ::testing::Test { public: diff --git a/unit_tests/program/program_data_tests.cpp b/unit_tests/program/program_data_tests.cpp index f887b53634..803bff21d6 100644 --- a/unit_tests/program/program_data_tests.cpp +++ b/unit_tests/program/program_data_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/mocks/mock_program.h" #include "unit_tests/program/program_with_source.h" -using namespace OCLRT; +using namespace NEO; using namespace iOpenCL; static const char constValue[] = "11223344"; diff --git a/unit_tests/program/program_from_binary.h b/unit_tests/program/program_from_binary.h index 737a35d145..83d2f7fbcd 100644 --- a/unit_tests/program/program_from_binary.h +++ b/unit_tests/program/program_from_binary.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -15,7 +15,7 @@ #include -namespace OCLRT { +namespace NEO { //////////////////////////////////////////////////////////////////////////////// // ProgramFromBinaryTest Test Fixture @@ -97,4 +97,4 @@ class ProgramSimpleFixture : public DeviceFixture, protected: cl_int retVal; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/program/program_nonuniform.cpp b/unit_tests/program/program_nonuniform.cpp index ff7f9d8d1a..ad1651ac15 100644 --- a/unit_tests/program/program_nonuniform.cpp +++ b/unit_tests/program/program_nonuniform.cpp @@ -31,7 +31,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; class MyMockProgram : public MockProgram { public: @@ -159,7 +159,7 @@ TEST(ProgramNonUniform, UpdateAllowNonUniformOutcomeUniformFlag) { #include -namespace OCLRT { +namespace NEO { class ProgramNonUniformTest : public ContextFixture, public PlatformFixture, @@ -315,4 +315,4 @@ TEST_F(ProgramNonUniformTest, ExecuteKernelNonUniform12) { delete pKernel; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 7281492f58..7aa1b7a57b 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -44,7 +44,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; void ProgramTests::SetUp() { DeviceFixture::SetUp(); @@ -2836,8 +2836,8 @@ TEST_F(ProgramTests, givenCompilerInterfaceWhenCompileIsCalledThenProperIntermed compilerInterface->SetFclMain(compilerMain); compilerMain->Retain(); compilerInterface->SetIgcMain(compilerMain); - compilerMain->setDefaultCreatorFunc(OCLRT::MockIgcOclDeviceCtx::Create); - compilerMain->setDefaultCreatorFunc(OCLRT::MockFclOclDeviceCtx::Create); + compilerMain->setDefaultCreatorFunc(NEO::MockIgcOclDeviceCtx::Create); + compilerMain->setDefaultCreatorFunc(NEO::MockFclOclDeviceCtx::Create); pDevice->getExecutionEnvironment()->compilerInterface.reset(compilerInterface); compilerInterface->useLlvmText = true; @@ -2869,8 +2869,8 @@ TEST_F(ProgramTests, givenProgramWithSpirvWhenRebuildProgramIsCalledThenSpirvPat compilerInterface->SetFclMain(compilerMain); compilerMain->Retain(); compilerInterface->SetIgcMain(compilerMain); - compilerMain->setDefaultCreatorFunc(OCLRT::MockIgcOclDeviceCtx::Create); - compilerMain->setDefaultCreatorFunc(OCLRT::MockFclOclDeviceCtx::Create); + compilerMain->setDefaultCreatorFunc(NEO::MockIgcOclDeviceCtx::Create); + compilerMain->setDefaultCreatorFunc(NEO::MockFclOclDeviceCtx::Create); pDevice->getExecutionEnvironment()->compilerInterface.reset(compilerInterface); std::string receivedInput; diff --git a/unit_tests/program/program_tests.h b/unit_tests/program/program_tests.h index d1a906ba52..3735e24462 100644 --- a/unit_tests/program/program_tests.h +++ b/unit_tests/program/program_tests.h @@ -18,11 +18,11 @@ extern std::vector SourceFileNames; extern std::vector BinaryForSourceFileNames; extern std::vector KernelNames; -class ProgramTests : public OCLRT::DeviceFixture, +class ProgramTests : public NEO::DeviceFixture, public ::testing::Test, - public OCLRT::ContextFixture { + public NEO::ContextFixture { - using OCLRT::ContextFixture::SetUp; + using NEO::ContextFixture::SetUp; public: void SetUp() override; diff --git a/unit_tests/program/program_with_block_kernels_tests.cpp b/unit_tests/program/program_with_block_kernels_tests.cpp index 9efad9cc2f..4b8646fbf1 100644 --- a/unit_tests/program/program_with_block_kernels_tests.cpp +++ b/unit_tests/program/program_with_block_kernels_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,7 +16,7 @@ #include -namespace OCLRT { +namespace NEO { class ProgramWithBlockKernelsTest : public ContextFixture, public PlatformFixture, @@ -128,4 +128,4 @@ TEST_F(ProgramWithBlockKernelsTest, GivenKernelWithBlockKernelsWhenProgramIsLink EXPECT_EQ(nullptr, pProgram); } } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/program/program_with_kernel_debug_tests.cpp b/unit_tests/program/program_with_kernel_debug_tests.cpp index 6d34515687..34cf49b33a 100644 --- a/unit_tests/program/program_with_kernel_debug_tests.cpp +++ b/unit_tests/program/program_with_kernel_debug_tests.cpp @@ -22,7 +22,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; TEST_F(ProgramTests, givenDeafultProgramObjectWhenKernelDebugEnabledIsQueriedThenFalseIsReturned) { MockProgram program(*pDevice->getExecutionEnvironment(), pContext, false); @@ -68,7 +68,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenEnabledKernelDebugWhenProgramIsCompi if (pDevice->getHardwareInfo().pPlatform->eRenderCoreFamily >= IGFX_GEN9_CORE) { std::string receivedInternalOptions; - auto debugVars = OCLRT::getFclDebugVars(); + auto debugVars = NEO::getFclDebugVars(); debugVars.receivedInternalOptionsOutput = &receivedInternalOptions; gEnvironment->fclPushDebugVars(debugVars); @@ -130,7 +130,7 @@ TEST_F(ProgramWithKernelDebuggingTest, givenEnabledKernelDebugWhenProgramIsBuilt if (pDevice->getHardwareInfo().pPlatform->eRenderCoreFamily >= IGFX_GEN9_CORE) { std::string receivedInternalOptions; - auto debugVars = OCLRT::getFclDebugVars(); + auto debugVars = NEO::getFclDebugVars(); debugVars.receivedInternalOptionsOutput = &receivedInternalOptions; gEnvironment->fclPushDebugVars(debugVars); diff --git a/unit_tests/program/program_with_source.h b/unit_tests/program/program_with_source.h index dd20cfe754..edfa8474b6 100644 --- a/unit_tests/program/program_with_source.h +++ b/unit_tests/program/program_with_source.h @@ -16,7 +16,7 @@ #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/mocks/mock_context.h" -namespace OCLRT { +namespace NEO { // ProgramFromSource Test Fixture // Used to test the Program class @@ -63,4 +63,4 @@ class ProgramFromSourceTest : public ContextFixture, const char *KernelName; cl_int retVal; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sampler/get_sampler_info_tests.cpp b/unit_tests/sampler/get_sampler_info_tests.cpp index 3a3d55dac0..2696115d67 100644 --- a/unit_tests/sampler/get_sampler_info_tests.cpp +++ b/unit_tests/sampler/get_sampler_info_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(GetSamplerInfo, InvalidFlags_returnsError) { MockContext context; diff --git a/unit_tests/sampler/sampler_set_arg_tests.cpp b/unit_tests/sampler/sampler_set_arg_tests.cpp index 4a4b01f4f2..6d7d0c1252 100644 --- a/unit_tests/sampler/sampler_set_arg_tests.cpp +++ b/unit_tests/sampler/sampler_set_arg_tests.cpp @@ -19,9 +19,9 @@ #include "hw_cmds.h" -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { class Surface; }; diff --git a/unit_tests/sampler/sampler_tests.cpp b/unit_tests/sampler/sampler_tests.cpp index f7fa79ea08..a09c9f762a 100644 --- a/unit_tests/sampler/sampler_tests.cpp +++ b/unit_tests/sampler/sampler_tests.cpp @@ -15,7 +15,7 @@ #include -using namespace OCLRT; +using namespace NEO; struct CreateSampler : public ::testing::TestWithParam< std::tuple> { diff --git a/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index 16851572cf..7d516b623e 100644 --- a/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -15,7 +15,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; typedef ScenarioTest BarrierScenarioTest; diff --git a/unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp b/unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp index 21d2d88ccf..9fbb2ff7b6 100644 --- a/unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp +++ b/unit_tests/scenarios/blocked_enqueue_with_callback_scenario_tests.cpp @@ -16,7 +16,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct CallbackData { cl_kernel kernel; diff --git a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 84f0fcf18c..306a644838 100644 --- a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -17,7 +17,7 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/os_interface/windows/mock_wddm_memory_manager.h" -using namespace OCLRT; +using namespace NEO; struct EnqueueBufferWindowsTest : public HardwareParse, public ::testing::Test { diff --git a/unit_tests/scheduler/scheduler_kernel_tests.cpp b/unit_tests/scheduler/scheduler_kernel_tests.cpp index 3c676e02ce..b391c04c88 100644 --- a/unit_tests/scheduler/scheduler_kernel_tests.cpp +++ b/unit_tests/scheduler/scheduler_kernel_tests.cpp @@ -22,7 +22,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; class MockSchedulerKernel : public SchedulerKernel { diff --git a/unit_tests/scheduler/scheduler_source_tests.cpp b/unit_tests/scheduler/scheduler_source_tests.cpp index ea157082fc..f747b61577 100644 --- a/unit_tests/scheduler/scheduler_source_tests.cpp +++ b/unit_tests/scheduler/scheduler_source_tests.cpp @@ -22,7 +22,7 @@ extern PRODUCT_FAMILY defaultProductFamily; -using namespace OCLRT; +using namespace NEO; using namespace BuiltinKernelsSimulation; HWCMDTEST_F(IGFX_GEN8_CORE, SchedulerSourceTest, PatchGpgpuWalker) { diff --git a/unit_tests/scheduler/scheduler_source_tests.h b/unit_tests/scheduler/scheduler_source_tests.h index 51866adbfa..744213a771 100644 --- a/unit_tests/scheduler/scheduler_source_tests.h +++ b/unit_tests/scheduler/scheduler_source_tests.h @@ -14,14 +14,14 @@ class SchedulerSourceTest : public testing::Test { public: void SetUp() override { - pDevice = OCLRT::MockDevice::createWithNewExecutionEnvironment(nullptr); + pDevice = NEO::MockDevice::createWithNewExecutionEnvironment(nullptr); } void TearDown() override { delete pDevice; } - OCLRT::Device *pDevice; - OCLRT::MockContext context; + NEO::Device *pDevice; + NEO::MockContext context; template void givenDeviceQueueThenNumberOfEnqueuesEqualsNumberOfEnqueuesInSchedulerKernelCodeTest(); diff --git a/unit_tests/sharings/d3d/context_d3d_tests.cpp b/unit_tests/sharings/d3d/context_d3d_tests.cpp index 93f0aa7b8c..6bfb7fd3e2 100644 --- a/unit_tests/sharings/d3d/context_d3d_tests.cpp +++ b/unit_tests/sharings/d3d/context_d3d_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(D3DContextTest, sharingAreNotPresentByDefault) { MockContext context; diff --git a/unit_tests/sharings/gl/gl_arb_sync_event_tests.cpp b/unit_tests/sharings/gl/gl_arb_sync_event_tests.cpp index d5e4466d09..627c94b5d5 100644 --- a/unit_tests/sharings/gl/gl_arb_sync_event_tests.cpp +++ b/unit_tests/sharings/gl/gl_arb_sync_event_tests.cpp @@ -21,18 +21,18 @@ #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_event.h" -using namespace OCLRT; +using namespace NEO; TEST(GlArbSyncEvent, whenCreateArbSyncEventNameIsCalledMultipleTimesThenEachCallReturnsUniqueName) { - char *name1 = OCLRT::createArbSyncEventName(); + char *name1 = NEO::createArbSyncEventName(); EXPECT_NE(nullptr, name1); EXPECT_STRNE("", name1); - char *name2 = OCLRT::createArbSyncEventName(); + char *name2 = NEO::createArbSyncEventName(); EXPECT_NE(nullptr, name2); EXPECT_STRNE("", name2); - char *name3 = OCLRT::createArbSyncEventName(); + char *name3 = NEO::createArbSyncEventName(); EXPECT_NE(nullptr, name3); EXPECT_STRNE("", name3); @@ -40,13 +40,13 @@ TEST(GlArbSyncEvent, whenCreateArbSyncEventNameIsCalledMultipleTimesThenEachCall EXPECT_STRNE(name1, name3); EXPECT_STRNE(name2, name3); - OCLRT::destroyArbSyncEventName(name1); - OCLRT::destroyArbSyncEventName(name2); - OCLRT::destroyArbSyncEventName(name3); + NEO::destroyArbSyncEventName(name1); + NEO::destroyArbSyncEventName(name2); + NEO::destroyArbSyncEventName(name3); } template -inline void glArbSyncObjectWaitServerMock(OCLRT::OSInterface &osInterface, CL_GL_SYNC_INFO &glSyncInfo) { +inline void glArbSyncObjectWaitServerMock(NEO::OSInterface &osInterface, CL_GL_SYNC_INFO &glSyncInfo) { glSyncInfo.waitCalled = SignalWaited; } @@ -302,7 +302,7 @@ TEST_F(GlArbSyncEventTest, givenDisabledSharingWhenClGetCLEventInfoINTELIsCalled cl_event ev = baseEvent; CL_GL_SYNC_INFO *synInfoRet = reinterpret_cast(static_cast(0xFF)); cl_context ctxRet = {}; - auto sharing = ctx->getSharing(); + auto sharing = ctx->getSharing(); ctx->sharingFunctions[sharing->getId()] = nullptr; auto ret = clGetCLEventInfoINTEL(ev, &synInfoRet, &ctxRet); ctx->setSharingFunctions(new GlSharingFunctionsMock()); diff --git a/unit_tests/sharings/gl/gl_create_from_texture_tests.cpp b/unit_tests/sharings/gl/gl_create_from_texture_tests.cpp index 3d5e9175bf..f3f5f7ef6a 100644 --- a/unit_tests/sharings/gl/gl_create_from_texture_tests.cpp +++ b/unit_tests/sharings/gl/gl_create_from_texture_tests.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class CreateFromGlTexture : public ::testing::Test { public: // temp solution - we need to query size from GMM: @@ -323,4 +323,4 @@ TEST_F(CreateFromGlTextureTests, GivenGlTextureTargetAndMipLevelNonNegativeWhenC EXPECT_GE(1u, glImage->getImageDesc().num_mip_levels); EXPECT_EQ(glImage->peekBaseMipLevel(), 2); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp index 9238741c07..36b81caab0 100644 --- a/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp +++ b/unit_tests/sharings/gl/gl_reused_buffers_tests.cpp @@ -14,7 +14,7 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_memory_manager.h" -using namespace OCLRT; +using namespace NEO; struct GlReusedBufferTests : public ::testing::Test { void SetUp() override { diff --git a/unit_tests/sharings/gl/gl_sharing_enable_tests.cpp b/unit_tests/sharings/gl/gl_sharing_enable_tests.cpp index 278bcdb4f8..eaa4b3c898 100644 --- a/unit_tests/sharings/gl/gl_sharing_enable_tests.cpp +++ b/unit_tests/sharings/gl/gl_sharing_enable_tests.cpp @@ -11,7 +11,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class GlSharingEnablerTests : public MemoryManagementFixture, public ::testing::Test { public: diff --git a/unit_tests/sharings/gl/gl_sharing_tests.cpp b/unit_tests/sharings/gl/gl_sharing_tests.cpp index 517efc7c46..4493089f00 100644 --- a/unit_tests/sharings/gl/gl_sharing_tests.cpp +++ b/unit_tests/sharings/gl/gl_sharing_tests.cpp @@ -33,7 +33,7 @@ #include "gl/gl_sharing_os.h" -using namespace OCLRT; +using namespace NEO; bool MockGLSharingFunctions::SharingEnabled = false; class glSharingTests : public ::testing::Test { @@ -373,7 +373,7 @@ TEST_F(glSharingTests, givenEnabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalle DebugManager.flags.EnableAsyncEventsHandler.set(true); auto handler = new MockHandler(false); - auto oldHandler = OCLRT::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); + auto oldHandler = NEO::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); struct ExternallySynchronizedEvent : Event { ExternallySynchronizedEvent() @@ -424,7 +424,7 @@ TEST_F(glSharingTests, givenEnabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalle event->release(); - OCLRT::platform()->setAsyncEventsHandler(std::move(oldHandler)); + NEO::platform()->setAsyncEventsHandler(std::move(oldHandler)); } TEST_F(glSharingTests, givenDisabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalledWithIncompleteExternallySynchronizedEventThenItIsNotAddedToAsyncEventsHandler) { @@ -432,7 +432,7 @@ TEST_F(glSharingTests, givenDisabledAsyncEventsHandlerWhenAcquireGlObjectsIsCall DebugManager.flags.EnableAsyncEventsHandler.set(false); auto handler = new MockHandler(false); - auto oldHandler = OCLRT::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); + auto oldHandler = NEO::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); struct ExternallySynchronizedEvent : Event { ExternallySynchronizedEvent() @@ -459,7 +459,7 @@ TEST_F(glSharingTests, givenDisabledAsyncEventsHandlerWhenAcquireGlObjectsIsCall event->release(); - OCLRT::platform()->setAsyncEventsHandler(std::move(oldHandler)); + NEO::platform()->setAsyncEventsHandler(std::move(oldHandler)); } TEST_F(glSharingTests, givenEnabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalledWithIncompleteButNotExternallySynchronizedEventThenItIsNotAddedToAsyncEventsHandler) { @@ -467,7 +467,7 @@ TEST_F(glSharingTests, givenEnabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalle DebugManager.flags.EnableAsyncEventsHandler.set(false); auto handler = new MockHandler(false); - auto oldHandler = OCLRT::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); + auto oldHandler = NEO::platform()->setAsyncEventsHandler(std::unique_ptr(handler)); auto *event = new UserEvent; cl_event clEvent = static_cast(event); @@ -484,7 +484,7 @@ TEST_F(glSharingTests, givenEnabledAsyncEventsHandlerWhenAcquireGlObjectsIsCalle event->release(); - OCLRT::platform()->setAsyncEventsHandler(std::move(oldHandler)); + NEO::platform()->setAsyncEventsHandler(std::move(oldHandler)); } TEST_F(glSharingTests, givenHwCommandQueueWhenReleaseIsCalledWithIncorrectWaitlistThenReturnError) { diff --git a/unit_tests/sharings/gl/gl_texture_tests.cpp b/unit_tests/sharings/gl/gl_texture_tests.cpp index 0429b3fe2a..5de0ef07ad 100644 --- a/unit_tests/sharings/gl/gl_texture_tests.cpp +++ b/unit_tests/sharings/gl/gl_texture_tests.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class GlSharingTextureTests : public ::testing::Test { public: diff --git a/unit_tests/sharings/gl/gl_types_tests.cpp b/unit_tests/sharings/gl/gl_types_tests.cpp index 96bb318916..c61938ebe7 100644 --- a/unit_tests/sharings/gl/gl_types_tests.cpp +++ b/unit_tests/sharings/gl/gl_types_tests.cpp @@ -11,7 +11,7 @@ #include "config.h" #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { namespace glTypes { static const std::tuple allImageFormats[] = { // input, output, output @@ -116,4 +116,4 @@ TEST_P(GlClObjTypesTests, typeConversion) { EXPECT_EQ(expectedClGlObjType, clGlObjType); EXPECT_EQ(clMemObjType, expectedClMemObjType); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sharings/sharing_factory_tests.cpp b/unit_tests/sharings/sharing_factory_tests.cpp index 905e78d0ba..033aa647bf 100644 --- a/unit_tests/sharings/sharing_factory_tests.cpp +++ b/unit_tests/sharings/sharing_factory_tests.cpp @@ -18,7 +18,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class SharingFactoryStateRestore : public SharingFactory { public: diff --git a/unit_tests/sharings/sharing_tests.cpp b/unit_tests/sharings/sharing_tests.cpp index 222a921375..104d69c443 100644 --- a/unit_tests/sharings/sharing_tests.cpp +++ b/unit_tests/sharings/sharing_tests.cpp @@ -12,7 +12,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(sharingHandler, givenBasicSharingHandlerWhenSynchronizeObjectThenErrorIsReturned) { struct SH : SharingHandler { diff --git a/unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp b/unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp index 46be620d73..ead109d7ef 100644 --- a/unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp +++ b/unit_tests/sharings/va/cl_create_from_va_media_surface_tests.cpp @@ -9,7 +9,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clCreateFromVaMediaSurfaceTests; diff --git a/unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp b/unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp index 97cd5e9264..d32b079083 100644 --- a/unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp +++ b/unit_tests/sharings/va/cl_enqueue_acquire_va_media_surfaces_tests.cpp @@ -9,7 +9,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueAcquireVaMediaSurfacesTests; diff --git a/unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp b/unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp index 65ede7d568..478f5765a7 100644 --- a/unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp +++ b/unit_tests/sharings/va/cl_enqueue_release_va_media_surfaces_tests.cpp @@ -9,7 +9,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef api_tests clEnqueueReleaseVaMediaSurfacesTests; diff --git a/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp b/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp index 7333a2f481..9e3b8753a4 100644 --- a/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp +++ b/unit_tests/sharings/va/cl_get_extension_function_address_tests.cpp @@ -1,28 +1,13 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #include "unit_tests/api/cl_api_tests.h" -using namespace OCLRT; +using namespace NEO; typedef api_tests clGetExtensionFunctionAddressTests; diff --git a/unit_tests/sharings/va/context_va_tests.cpp b/unit_tests/sharings/va/context_va_tests.cpp index b3d34a8fc6..15c62f9c75 100644 --- a/unit_tests/sharings/va/context_va_tests.cpp +++ b/unit_tests/sharings/va/context_va_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; struct VAContextTest : public PlatformFixture, public ::testing::Test { @@ -53,7 +53,7 @@ TEST_F(VAContextTest, sharingAreNotPresentByDefault) { TEST_F(VAContextTest, GivenVaContextParamWhenCreateContextThenReturnError) { cl_device_id deviceID = devices[0]; - auto pPlatform = OCLRT::platform(); + auto pPlatform = NEO::platform(); cl_platform_id pid[1]; pid[0] = pPlatform; DebugManagerStateRestore dbgRestorer; diff --git a/unit_tests/sharings/va/kernel_va_image_arg_tests.cpp b/unit_tests/sharings/va/kernel_va_image_arg_tests.cpp index da46fc2c24..2e496b1a41 100644 --- a/unit_tests/sharings/va/kernel_va_image_arg_tests.cpp +++ b/unit_tests/sharings/va/kernel_va_image_arg_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST_F(KernelImageArgTest, givenSharedImageWhenSetArgIsCalledThenReportSharedObjUsage) { MockVaSharing vaSharing; diff --git a/unit_tests/sharings/va/mock_va_sharing.cpp b/unit_tests/sharings/va/mock_va_sharing.cpp index d3a700033b..7d9bc68951 100644 --- a/unit_tests/sharings/va/mock_va_sharing.cpp +++ b/unit_tests/sharings/va/mock_va_sharing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/sharings/va/mock_va_sharing.h" -namespace OCLRT { +namespace NEO { int vaDisplayIsValidCalled = 0; int vaDeriveImageCalled = 0; int vaDestroyImageCalled = 0; @@ -39,4 +39,4 @@ void VASharingFunctionsMock::initMembers() { vaSharingFunctionsMockWidth = 256u; vaSharingFunctionsMockHeight = 256u; } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sharings/va/mock_va_sharing.h b/unit_tests/sharings/va/mock_va_sharing.h index b3907878f2..eaac0b4856 100644 --- a/unit_tests/sharings/va/mock_va_sharing.h +++ b/unit_tests/sharings/va/mock_va_sharing.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/sharings/va/va_sharing.h" -namespace OCLRT { +namespace NEO { extern int vaDisplayIsValidCalled; extern int vaDeriveImageCalled; @@ -87,4 +87,4 @@ class MockVaSharing { VASharingFunctionsMock m_sharingFunctions; osHandle sharingHandle = 0; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sharings/va/va_base_object_tests.cpp b/unit_tests/sharings/va/va_base_object_tests.cpp index 62931eac0f..f12216e65a 100644 --- a/unit_tests/sharings/va/va_base_object_tests.cpp +++ b/unit_tests/sharings/va/va_base_object_tests.cpp @@ -14,7 +14,7 @@ #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { template struct VABaseObjectTests : public ::testing::Test { @@ -61,4 +61,4 @@ TYPED_TEST(VABaseObjectTests, commonRuntimeExpectsDispatchTableAtFirstPointerInO EXPECT_EQ(reinterpret_cast(clGetDeviceIDsFromVA_APIMediaAdapterINTEL), genericObject->dispatch.crtDispatch->clGetDeviceIDsFromVA_APIMediaAdapterINTEL); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sharings/va/va_sharing_enable_tests.cpp b/unit_tests/sharings/va/va_sharing_enable_tests.cpp index 907d45192f..2f138f0948 100644 --- a/unit_tests/sharings/va/va_sharing_enable_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_enable_tests.cpp @@ -13,7 +13,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; static int vaDisplayIsValidRet = 1; extern "C" int vaDisplayIsValid(VADisplay vaDisplay) { diff --git a/unit_tests/sharings/va/va_sharing_linux_tests.cpp b/unit_tests/sharings/va/va_sharing_linux_tests.cpp index 07f4c5e538..ee94268d2d 100644 --- a/unit_tests/sharings/va/va_sharing_linux_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_linux_tests.cpp @@ -13,7 +13,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; class VASharingFunctionsTested : public VASharingFunctions { public: diff --git a/unit_tests/sharings/va/va_sharing_tests.cpp b/unit_tests/sharings/va/va_sharing_tests.cpp index 7814dc21de..81cb12cd9c 100644 --- a/unit_tests/sharings/va/va_sharing_tests.cpp +++ b/unit_tests/sharings/va/va_sharing_tests.cpp @@ -18,7 +18,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; class VaSharingTests : public ::testing::Test, public PlatformFixture { public: diff --git a/unit_tests/sku_info/sku_info_base_reference.h b/unit_tests/sku_info/sku_info_base_reference.h index 72cae000f7..94f743e506 100644 --- a/unit_tests/sku_info/sku_info_base_reference.h +++ b/unit_tests/sku_info/sku_info_base_reference.h @@ -11,7 +11,7 @@ #include "sku_info.h" -namespace OCLRT { +namespace NEO { struct SkuInfoBaseReference { static void fillReferenceFtrForTransfer(_SKU_FEATURE_TABLE &refFtrTable) { memset(&refFtrTable, 0, sizeof(refFtrTable)); @@ -145,4 +145,4 @@ struct SkuInfoBaseReference { refWaTable.waSamplerCacheFlushBetweenRedescribedSurfaceReads = true; } }; // namespace SkuInfoBaseReference -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/sku_info/sku_info_receiver_tests.cpp b/unit_tests/sku_info/sku_info_receiver_tests.cpp index d32a5fa6ce..2e12b99e33 100644 --- a/unit_tests/sku_info/sku_info_receiver_tests.cpp +++ b/unit_tests/sku_info/sku_info_receiver_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(SkuInfoReceiverTest, givenAdapterInfoWhenReceivingThenUpdateFtrTable) { FeatureTable refFeatureTable = {}; diff --git a/unit_tests/sku_info/sku_info_transfer_tests.cpp b/unit_tests/sku_info/sku_info_transfer_tests.cpp index 9228981b18..fc295bd509 100644 --- a/unit_tests/sku_info/sku_info_transfer_tests.cpp +++ b/unit_tests/sku_info/sku_info_transfer_tests.cpp @@ -10,7 +10,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(SkuInfoTransferTest, givenFeatureTableWhenFillingStructureForGmmThenCopyOnlySelectedValues) { _SKU_FEATURE_TABLE requestedFtrTable = {}; diff --git a/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp b/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp index 4908face93..21ff2562ab 100644 --- a/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/unit_tests/source_level_debugger/source_level_debugger_device_tests.cpp @@ -15,7 +15,7 @@ #include "unit_tests/mocks/mock_source_level_debugger.h" using PreambleTest = ::testing::Test; -using namespace OCLRT; +using namespace NEO; class MockOsLibrary : public OsLibrary { public: diff --git a/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl b/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl index 1d5ae6a63c..3976e90782 100644 --- a/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl +++ b/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * */ -using namespace OCLRT; +using namespace NEO; template void SourceLevelDebuggerPreambleTest::givenMidThreadPreemptionAndDebuggingActiveWhenStateSipIsProgrammedThenCorrectSipKernelIsUsedTest() { diff --git a/unit_tests/source_level_debugger/source_level_debugger_tests.cpp b/unit_tests/source_level_debugger/source_level_debugger_tests.cpp index 9ee11f20c4..760f1ac0bb 100644 --- a/unit_tests/source_level_debugger/source_level_debugger_tests.cpp +++ b/unit_tests/source_level_debugger/source_level_debugger_tests.cpp @@ -22,7 +22,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using std::string; using std::unique_ptr; @@ -530,12 +530,12 @@ TEST(SourceLevelDebugger, givenTwoDevicesWhenSecondIsCreatedThenNotCreatingNewSo ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment(); - std::unique_ptr device1(Device::create(nullptr, executionEnvironment, 0u)); + std::unique_ptr device1(Device::create(nullptr, executionEnvironment, 0u)); EXPECT_NE(nullptr, executionEnvironment->memoryManager); EXPECT_TRUE(interceptor.initCalled); interceptor.initCalled = false; - std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); + std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); EXPECT_NE(nullptr, executionEnvironment->memoryManager); EXPECT_FALSE(interceptor.initCalled); } @@ -549,9 +549,9 @@ TEST(SourceLevelDebugger, givenMultipleDevicesWhenTheyAreCreatedTheyAllReuseTheS DebuggerLibrary::setDebuggerActive(true); ExecutionEnvironment *executionEnvironment = platformImpl->peekExecutionEnvironment(); - std::unique_ptr device1(Device::create(nullptr, executionEnvironment, 0u)); + std::unique_ptr device1(Device::create(nullptr, executionEnvironment, 0u)); auto sourceLevelDebugger = device1->getSourceLevelDebugger(); - std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); + std::unique_ptr device2(Device::create(nullptr, executionEnvironment, 1u)); EXPECT_EQ(sourceLevelDebugger, device2->getSourceLevelDebugger()); } } diff --git a/unit_tests/tbx/main_tbx.cpp b/unit_tests/tbx/main_tbx.cpp index 1957cacaf1..d6562ca801 100644 --- a/unit_tests/tbx/main_tbx.cpp +++ b/unit_tests/tbx/main_tbx.cpp @@ -11,11 +11,11 @@ #include "unit_tests/helpers/debug_manager_state_restore.h" #include "unit_tests/helpers/gtest_helpers.h" -using namespace OCLRT; +using namespace NEO; -namespace OCLRT { +namespace NEO { bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO TEST(CSRTests, getDevices) { HardwareInfo *hwInfo = nullptr; @@ -24,7 +24,7 @@ TEST(CSRTests, getDevices) { DebugManagerStateRestore dbgState; DebugManager.flags.SetCommandStreamReceiver.set(2); ExecutionEnvironment executionEnvironment; - OCLRT::getDevices(&hwInfo, numDevicesReturned, executionEnvironment); + NEO::getDevices(&hwInfo, numDevicesReturned, executionEnvironment); ASSERT_NE(nullptr, hwInfo); ASSERT_NE(nullptr, hwInfo->pSysInfo); diff --git a/unit_tests/tbx/tbx_tests_configuration.cpp b/unit_tests/tbx/tbx_tests_configuration.cpp index 4a3cb0ad10..4cd60c80c7 100644 --- a/unit_tests/tbx/tbx_tests_configuration.cpp +++ b/unit_tests/tbx/tbx_tests_configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,6 @@ #include "unit_tests/tests_configuration.h" -namespace OCLRT { +namespace NEO { TestMode testMode = TestMode::TbxTests; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/tests_configuration.h b/unit_tests/tests_configuration.h index 45ae53e449..7e851cfd51 100644 --- a/unit_tests/tests_configuration.h +++ b/unit_tests/tests_configuration.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -namespace OCLRT { +namespace NEO { enum class TestMode { NotSpecified, UnitTests, AubTests, @@ -15,4 +15,4 @@ enum class TestMode { NotSpecified, TbxTests }; extern TestMode testMode; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/ult_config_listener.cpp b/unit_tests/ult_config_listener.cpp index a6aece9b16..cf54499d95 100644 --- a/unit_tests/ult_config_listener.cpp +++ b/unit_tests/ult_config_listener.cpp @@ -11,12 +11,12 @@ #include "runtime/helpers/options.h" #include "runtime/platform/platform.h" -void OCLRT::UltConfigListener::OnTestStart(const ::testing::TestInfo &testInfo) { +void NEO::UltConfigListener::OnTestStart(const ::testing::TestInfo &testInfo) { constructPlatform()->peekExecutionEnvironment()->setHwInfo(*platformDevices); // Create platform and initialize gmm that dont want to create Platform and test gmm initialization path platform()->peekExecutionEnvironment()->initGmm(); } -void OCLRT::UltConfigListener::OnTestEnd(const ::testing::TestInfo &testInfo) { +void NEO::UltConfigListener::OnTestEnd(const ::testing::TestInfo &testInfo) { // Clear global platform that it shouldn't be reused between tests platformImpl.reset(); } diff --git a/unit_tests/ult_config_listener.h b/unit_tests/ult_config_listener.h index 7e8537b6ef..a6f9de11b1 100644 --- a/unit_tests/ult_config_listener.h +++ b/unit_tests/ult_config_listener.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,10 +8,10 @@ #pragma once #include "gtest/gtest.h" -namespace OCLRT { +namespace NEO { class UltConfigListener : public ::testing::EmptyTestEventListener { private: void OnTestStart(const ::testing::TestInfo &) override; void OnTestEnd(const ::testing::TestInfo &) override; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/ult_configuration.cpp b/unit_tests/ult_configuration.cpp index 882703b42c..7b90f4340f 100644 --- a/unit_tests/ult_configuration.cpp +++ b/unit_tests/ult_configuration.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #include "unit_tests/tests_configuration.h" -namespace OCLRT { +namespace NEO { unsigned int ultIterationMaxTime = 45; bool useMockGmm = true; const char *executionDirectorySuffix = ""; TestMode testMode = TestMode::UnitTests; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/utilities/base_object_utils.h b/unit_tests/utilities/base_object_utils.h index 422d7a3ee5..3a1e2b4088 100644 --- a/unit_tests/utilities/base_object_utils.h +++ b/unit_tests/utilities/base_object_utils.h @@ -8,7 +8,7 @@ #pragma once #include -namespace OCLRT { +namespace NEO { template struct ReleaseObject { @@ -31,4 +31,4 @@ template inline ReleaseableObjectPtr<_Ty> make_releaseable(_Types &&... _Args) { return (ReleaseableObjectPtr<_Ty>(new _Ty(std::forward<_Types>(_Args)...))); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/utilities/containers_tests.cpp b/unit_tests/utilities/containers_tests.cpp index e848857de5..bb2ffbf0c7 100644 --- a/unit_tests/utilities/containers_tests.cpp +++ b/unit_tests/utilities/containers_tests.cpp @@ -21,7 +21,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; struct DummyFNode : IFNode { DummyFNode(uint32_t *destructorsCounter = nullptr) diff --git a/unit_tests/utilities/cpuinfo_tests.cpp b/unit_tests/utilities/cpuinfo_tests.cpp index 1ba14aa535..630caedaf8 100644 --- a/unit_tests/utilities/cpuinfo_tests.cpp +++ b/unit_tests/utilities/cpuinfo_tests.cpp @@ -9,7 +9,7 @@ #include "gtest/gtest.h" -using namespace OCLRT; +using namespace NEO; TEST(CpuInfo, detectsSSE4) { const CpuInfo &cpuInfo = CpuInfo::getInstance(); diff --git a/unit_tests/utilities/debug_file_reader_tests.cpp b/unit_tests/utilities/debug_file_reader_tests.cpp index 36727e9029..3fa6e62f23 100644 --- a/unit_tests/utilities/debug_file_reader_tests.cpp +++ b/unit_tests/utilities/debug_file_reader_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2018 Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "unit_tests/utilities/debug_file_reader_tests.inl" -using namespace OCLRT; +using namespace NEO; using namespace std; TEST(SettingsFileReader, givenTestFileWithDefaultValuesWhenTheyAreQueriedThenDefaultValuesMatch) { diff --git a/unit_tests/utilities/debug_file_reader_tests.inl b/unit_tests/utilities/debug_file_reader_tests.inl index 51dce5b6d2..ce9768c8ca 100644 --- a/unit_tests/utilities/debug_file_reader_tests.inl +++ b/unit_tests/utilities/debug_file_reader_tests.inl @@ -14,7 +14,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; class TestSettingsFileReader : public SettingsFileReader { diff --git a/unit_tests/utilities/debug_settings_reader_creator.cpp b/unit_tests/utilities/debug_settings_reader_creator.cpp index 672344c767..22ac98f33e 100644 --- a/unit_tests/utilities/debug_settings_reader_creator.cpp +++ b/unit_tests/utilities/debug_settings_reader_creator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "runtime/utilities/debug_settings_reader_creator.h" -namespace OCLRT { +namespace NEO { std::unique_ptr SettingsReaderCreator::create() { return std::unique_ptr(SettingsReader::createOsReader(false)); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/utilities/debug_settings_reader_tests.cpp b/unit_tests/utilities/debug_settings_reader_tests.cpp index f5d66114d8..c027ae499b 100644 --- a/unit_tests/utilities/debug_settings_reader_tests.cpp +++ b/unit_tests/utilities/debug_settings_reader_tests.cpp @@ -15,7 +15,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; TEST(SettingsReader, Create) { diff --git a/unit_tests/utilities/destructor_counted.h b/unit_tests/utilities/destructor_counted.h index c5ff9af447..42578012e1 100644 --- a/unit_tests/utilities/destructor_counted.h +++ b/unit_tests/utilities/destructor_counted.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "test.h" -namespace OCLRT { +namespace NEO { template struct DestructorCounted : public BaseType { @@ -24,4 +24,4 @@ struct DestructorCounted : public BaseType { private: uint32_t &destructorId; }; -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/utilities/directory_tests.cpp b/unit_tests/utilities/directory_tests.cpp index 94fb0ca4ce..e99900c300 100644 --- a/unit_tests/utilities/directory_tests.cpp +++ b/unit_tests/utilities/directory_tests.cpp @@ -13,7 +13,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; TEST(Directory, GetFiles) { diff --git a/unit_tests/utilities/heap_allocator_tests.cpp b/unit_tests/utilities/heap_allocator_tests.cpp index 45f09112a2..90789d682e 100644 --- a/unit_tests/utilities/heap_allocator_tests.cpp +++ b/unit_tests/utilities/heap_allocator_tests.cpp @@ -13,7 +13,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; const size_t sizeThreshold = 16 * 4096; diff --git a/unit_tests/utilities/numeric_tests.cpp b/unit_tests/utilities/numeric_tests.cpp index 4267d4fbfb..e949f46de8 100644 --- a/unit_tests/utilities/numeric_tests.cpp +++ b/unit_tests/utilities/numeric_tests.cpp @@ -10,7 +10,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(StorageTypeTest, whenGivenNumberOfBitsThenPicksIntegerTypeThatIsLargeEnough) { static_assert(std::is_same>::value, ""); diff --git a/unit_tests/utilities/perf_profiler.cpp b/unit_tests/utilities/perf_profiler.cpp index 0ea69ba5a2..229eca0fd8 100644 --- a/unit_tests/utilities/perf_profiler.cpp +++ b/unit_tests/utilities/perf_profiler.cpp @@ -14,7 +14,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; using namespace std; diff --git a/unit_tests/utilities/reference_tracked_object_tests.cpp b/unit_tests/utilities/reference_tracked_object_tests.cpp index 9c02454358..06a04c5cb1 100644 --- a/unit_tests/utilities/reference_tracked_object_tests.cpp +++ b/unit_tests/utilities/reference_tracked_object_tests.cpp @@ -11,7 +11,7 @@ #include -namespace OCLRT { +namespace NEO { TEST(RefCounter, referenceCount) { RefCounter<> rc; ASSERT_EQ(0, rc.peek()); @@ -253,4 +253,4 @@ TEST(ReferenceTrackedObject, whenNewReferenceTrackedObjectIsCreatedRefcountsAreZ EXPECT_EQ(0, obj.getRefApiCount()); EXPECT_EQ(0, obj.getRefInternalCount()); } -} // namespace OCLRT +} // namespace NEO diff --git a/unit_tests/utilities/spinlock_tests.cpp b/unit_tests/utilities/spinlock_tests.cpp index 9c70b029b1..f75593c97b 100644 --- a/unit_tests/utilities/spinlock_tests.cpp +++ b/unit_tests/utilities/spinlock_tests.cpp @@ -12,7 +12,7 @@ #include #include -using namespace OCLRT; +using namespace NEO; TEST(SpinLockTest, givenTwoThreadsThenVerifyThatTheySynchronizeWithSpinLock) { std::atomic threadStarted(false); diff --git a/unit_tests/utilities/tag_allocator_tests.cpp b/unit_tests/utilities/tag_allocator_tests.cpp index 0e250d1f4f..ac4adb75ad 100644 --- a/unit_tests/utilities/tag_allocator_tests.cpp +++ b/unit_tests/utilities/tag_allocator_tests.cpp @@ -14,7 +14,7 @@ #include -using namespace OCLRT; +using namespace NEO; typedef Test TagAllocatorTest; diff --git a/unit_tests/utilities/timer_util_tests.cpp b/unit_tests/utilities/timer_util_tests.cpp index 9a5701d644..50077f7651 100644 --- a/unit_tests/utilities/timer_util_tests.cpp +++ b/unit_tests/utilities/timer_util_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(TimerTest, Get) { Timer::setFreq(); diff --git a/unit_tests/utilities/vec_tests.cpp b/unit_tests/utilities/vec_tests.cpp index 8ead6120fa..fd399fbfce 100644 --- a/unit_tests/utilities/vec_tests.cpp +++ b/unit_tests/utilities/vec_tests.cpp @@ -8,7 +8,7 @@ #include "runtime/utilities/vec.h" #include "test.h" -using namespace OCLRT; +using namespace NEO; TEST(VecTest, operators) { Vec3 v0(nullptr); diff --git a/unit_tests/windows/get_devices_tests.cpp b/unit_tests/windows/get_devices_tests.cpp index e3b2dc6169..32e1ffe4ee 100644 --- a/unit_tests/windows/get_devices_tests.cpp +++ b/unit_tests/windows/get_devices_tests.cpp @@ -9,17 +9,17 @@ #include "runtime/helpers/hw_info.h" #include "test.h" -namespace OCLRT { +namespace NEO { bool getDevices(HardwareInfo **hwInfo, size_t &numDevicesReturned, ExecutionEnvironment &executionEnvironment); -} // namespace OCLRT +} // namespace NEO using GetDevicesTests = ::testing::Test; HWTEST_F(GetDevicesTests, WhenGetDevicesIsCalledThenSuccessIsReturned) { - OCLRT::HardwareInfo *hwInfo; + NEO::HardwareInfo *hwInfo; size_t numDevicesReturned = 0; - OCLRT::ExecutionEnvironment executionEnviornment; + NEO::ExecutionEnvironment executionEnviornment; - auto returnValue = OCLRT::getDevices(&hwInfo, numDevicesReturned, executionEnviornment); + auto returnValue = NEO::getDevices(&hwInfo, numDevicesReturned, executionEnviornment); EXPECT_EQ(true, returnValue); } diff --git a/unit_tests/windows/os_interface_tests.cpp b/unit_tests/windows/os_interface_tests.cpp index 352babca5f..12f194de8a 100644 --- a/unit_tests/windows/os_interface_tests.cpp +++ b/unit_tests/windows/os_interface_tests.cpp @@ -10,5 +10,5 @@ #include "test.h" TEST(osInterfaceTests, osInterfaceLocalMemoryEnabledByDefault) { - EXPECT_EQ(is64bit, OCLRT::OSInterface::osEnableLocalMemory); + EXPECT_EQ(is64bit, NEO::OSInterface::osEnableLocalMemory); } diff --git a/unit_tests/windows/wddm_create_tests.cpp b/unit_tests/windows/wddm_create_tests.cpp index e6a8526b7c..ac62e99735 100644 --- a/unit_tests/windows/wddm_create_tests.cpp +++ b/unit_tests/windows/wddm_create_tests.cpp @@ -12,7 +12,7 @@ #include -using namespace OCLRT; +using namespace NEO; TEST(wddmCreateTests, givenInputVersionWhenCreatingThenCreateRequestedObject) { std::unique_ptr wddm(Wddm::createWddm());