Change namespace from OCLRT to NEO

Change-Id: If965c79d70392db26597aea4c2f3b7ae2820fe96
Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>

common/helpers/bit_helpers.h

@@ -10,7 +10,7 @@
 #include <cstdint>
 #include <limits>
 
-namespace OCLRT {
+namespace NEO {
 
 constexpr bool isBitSet(uint64_t field, uint64_t bitPosition) {
     assert(bitPosition < std::numeric_limits<uint64_t>::digits); // undefined behavior
@@ -26,4 +26,4 @@ constexpr bool isFieldValid(uint64_t field, uint64_t acceptedBits) {
     return ((field & (~acceptedBits)) == 0);
 }
 
-} // namespace OCLRT
+} // namespace NEO

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

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 <DebugFunctionalityLevel DebugLevel>
 DebugSettingsManager<DebugLevel>::DebugSettingsManager() {
@@ -45,4 +45,4 @@ bool familyEnabled[IGFX_MAX_CORE] = {
     false,
 };
 
-} // namespace OCLRT
+} // namespace NEO

offline_compiler/main.cpp

@@ -13,7 +13,7 @@
 #include "decoder/binary_encoder.h"
 #include <CL/cl.h>
 
-using namespace OCLRT;
+using namespace NEO;
 
 int main(int numArgs, const char *argv[]) {
     try {

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,7 +133,7 @@ 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(),
+            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

offline_compiler/offline_compiler.h

@@ -16,7 +16,7 @@
 #include <memory>
 #include <string>
 
-namespace OCLRT {
+namespace NEO {
 
 struct HardwareInfo;
 class OsLibrary;
@@ -112,4 +112,4 @@ class OfflineCompiler {
     CIF::RAII::UPtr_t<IGC::FclOclDeviceCtxTagOCL> fclDeviceCtx = nullptr;
     IGC::CodeType::CodeType_t preferredIntermediateRepresentation;
 };
-} // namespace OCLRT
+} // namespace NEO

offline_compiler/options.cpp

@@ -13,7 +13,7 @@
 
 #include <cstddef>
 
-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

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;

offline_compiler/utilities/linux/safety_guard_linux.h

@@ -55,7 +55,7 @@ class SafetyGuardLinux {
             if (onSigSegv) {
                 onSigSegv();
             } else {
-                OCLRT::abortExecution();
+                NEO::abortExecution();
             }
         }
         return retValueOnCrash;

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);
+extern int buildWithSafetyGuard(NEO::OfflineCompiler *compiler);

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;

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);
             }

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<OCLRT::OsLibrary> psApiLib(OCLRT::OsLibrary::load("psapi.dll"));
+    unique_ptr<NEO::OsLibrary> psApiLib(NEO::OsLibrary::load("psapi.dll"));
     auto getMappedFileName = reinterpret_cast<getMappedFileNameFunction>(psApiLib->getProcAddress("GetMappedFileNameA"));
 
     size_t callstackCounter = 0;

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

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
+ * SPDX-License-Identifier: MIT
- * 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.
  */
 
 #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

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

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

runtime/api/api.cpp

@@ -43,7 +43,7 @@
 #include <algorithm>
 #include <cstring>
 
-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;

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

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<aub_stream::AubManager> aubManager;
     uint32_t aubStreamMode = 0;
 };
-} // namespace OCLRT
+} // namespace NEO

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

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

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 <typename Family>
 int AubHelperHw<Family>::getDataHintForPml4Entry() const {
@@ -58,4 +58,4 @@ int AubHelperHw<Family>::getMemTraceForPtEntry() const {
     return AubMemDump::AddressSpaceValues::TracePpgttEntry;
 }
 
-} // namespace OCLRT
+} // namespace NEO

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 &registers, char delimi
     return result;
 }
 
-} // namespace OCLRT
+} // namespace NEO

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

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 {
 

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 {
 

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<uint32_t>(dbgOffset)) {
             offset = static_cast<uint32_t>(dbgOffset);
-            value = static_cast<uint32_t>(OCLRT::DebugManager.flags.AubDumpOverrideMmioRegisterValue.get());
+            value = static_cast<uint32_t>(NEO::DebugManager.flags.AubDumpOverrideMmioRegisterValue.get());
         }
     }
     writeMMIOImpl(offset, value);

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<Traits>, 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<Traits>, 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<TraitsIn::addressingBits == 32, AubPage
     static uint64_t reserveAddressGGTT(Stream &stream, uint32_t addr, size_t size, uint64_t physStart, AubGTTData data);
     static uint64_t reserveAddressGGTT(Stream &stream, const void *memory, size_t size, uint64_t physStart, AubGTTData data);
     static void reserveAddressGGTTAndWriteMmeory(Stream &stream, uintptr_t gfxAddress, const void *memory, uint64_t physAddress,
-                                                 size_t size, size_t offset, uint64_t additionalBits, const OCLRT::AubHelper &aubHelper);
+                                                 size_t size, size_t offset, uint64_t additionalBits, const NEO::AubHelper &aubHelper);
 
     static void setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTData data);
 

runtime/aub_mem_dump/aub_mem_dump.inl

@@ -120,13 +120,13 @@ template <typename Traits>
 void AubDump<Traits>::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<Traits>::reserveAddressPPGTT(stream, vmAddr, MemoryConstants::pageSize, pAddr, additionalBits, aubHelper);
 
-    int hint = OCLRT::AubHelper::getMemTrace(additionalBits);
+    int hint = NEO::AubHelper::getMemTrace(additionalBits);
 
     AubDump<Traits>::addMemoryWrite(stream, physAddress,
                                     reinterpret_cast<void *>(reinterpret_cast<uintptr_t>(memory) + offset),
@@ -144,7 +144,7 @@ void AubDump<Traits>::setGttEntry(MiGttEntry &entry, uint64_t address, AubGTTDat
 template <typename Traits>
 uint64_t AubPageTableHelper32<Traits>::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<Traits>::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<Traits>::reserveAddressPPGTT(typename Traits::Stre
 template <typename Traits>
 uint64_t AubPageTableHelper64<Traits>::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<Traits>::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<Traits>::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<Traits>::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);

runtime/built_ins/aux_translation_builtin.h

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-namespace OCLRT {
+namespace NEO {
 template <typename HWFamily>
 class BuiltInOp<HWFamily, EBuiltInOps::AuxTranslation> : public BuiltinDispatchInfoBuilder {
   public:
@@ -27,4 +27,4 @@ class BuiltInOp<HWFamily, EBuiltInOps::AuxTranslation> : public BuiltinDispatchI
     mutable std::vector<std::unique_ptr<Kernel>> convertToAuxKernel;
 };
 
-} // namespace OCLRT
+} // namespace NEO

runtime/built_ins/built_ins.cpp

@@ -24,7 +24,7 @@
 #include <cstdint>
 #include <sstream>
 
-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

runtime/built_ins/built_ins.h

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <vector>
 
-namespace OCLRT {
+namespace NEO {
 typedef std::vector<char> BuiltinResourceT;
 
 class Context;
@@ -235,4 +235,4 @@ class BuiltInOwnershipWrapper : public NonCopyableOrMovableClass {
 template <typename HWFamily, EBuiltInOps OpCode>
 class BuiltInOp;
 
-} // namespace OCLRT
+} // namespace NEO

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 <typename... KernelsDescArgsT>
 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<HWFamily, EBuiltInOps::AuxTranslation>::resizeKernelInstances(siz
     }
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/built_ins/built_ins_storage.cpp

@@ -13,7 +13,7 @@
 
 #include <cstdint>
 
-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

runtime/built_ins/builtins_dispatch_builder.h

@@ -21,7 +21,7 @@
 #include <tuple>
 #include <vector>
 
-namespace OCLRT {
+namespace NEO {
 typedef std::vector<char> BuiltinResourceT;
 
 class Context;
@@ -99,4 +99,4 @@ class BuiltinDispatchInfoBuilder {
     BuiltIns &kernelsLib;
 };
 
-} // namespace OCLRT
+} // namespace NEO

runtime/built_ins/registry/built_ins_registry.h

@@ -12,7 +12,7 @@
 #include <string>
 #include <unordered_map>
 
-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

runtime/built_ins/registry/register_copy_kernels_source.cpp

@@ -9,7 +9,7 @@
 
 #include <string>
 
-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

runtime/built_ins/registry/register_ext_vme_source.cpp

@@ -9,7 +9,7 @@
 
 #include <string>
 
-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

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

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 <cinttypes>
 #include <memory>
 
-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

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 <typename HWFamily>
 class VmeBuiltinDispatchInfoBuilder : public BuiltinDispatchInfoBuilder {
   public:
@@ -475,4 +475,4 @@ class BuiltInOp<HWFamily, EBuiltInOps::VmeBlockAdvancedMotionEstimateBidirection
         return true;
     }
 };
-} // namespace OCLRT
+} // namespace NEO

runtime/builtin_kernels_simulation/gen10/scheduler_simulation.cpp

@@ -15,7 +15,7 @@
 
 #include "CL/cl.h"
 
-using namespace OCLRT;
+using namespace NEO;
 using namespace BuiltinKernelsSimulation;
 
 namespace Gen10SchedulerSimulation {

runtime/builtin_kernels_simulation/gen8/scheduler_simulation.cpp

@@ -15,7 +15,7 @@
 
 #include "CL/cl.h"
 
-using namespace OCLRT;
+using namespace NEO;
 using namespace BuiltinKernelsSimulation;
 
 namespace Gen8SchedulerSimulation {

runtime/builtin_kernels_simulation/gen9/scheduler_simulation.cpp

@@ -15,10 +15,10 @@
 
 #include "CL/cl.h"
 
-using namespace OCLRT;
+using namespace NEO;
 using namespace BuiltinKernelsSimulation;
 
-namespace OCLRT {
+namespace NEO {
 struct SKLFamily;
 }
 

runtime/builtin_kernels_simulation/scheduler_simulation.cpp

@@ -12,7 +12,7 @@
 #include <thread>
 
 using namespace std;
-using namespace OCLRT;
+using namespace NEO;
 
 namespace BuiltinKernelsSimulation {
 

runtime/builtin_kernels_simulation/scheduler_simulation.h

@@ -10,7 +10,7 @@
 
 #include <cstdint>
 #include <thread>
-namespace OCLRT {
+namespace NEO {
 class GraphicsAllocation;
 }
 
@@ -22,38 +22,38 @@ extern std::thread threads[];
 template <typename GfxFamily>
 class SchedulerSimulation {
   public:
-    void runSchedulerSimulation(OCLRT::GraphicsAllocation *queue,
+    void runSchedulerSimulation(NEO::GraphicsAllocation *queue,
-                                OCLRT::GraphicsAllocation *commandsStack,
+                                NEO::GraphicsAllocation *commandsStack,
-                                OCLRT::GraphicsAllocation *eventsPool,
+                                NEO::GraphicsAllocation *eventsPool,
-                                OCLRT::GraphicsAllocation *secondaryBatchBuffer,
+                                NEO::GraphicsAllocation *secondaryBatchBuffer,
-                                OCLRT::GraphicsAllocation *dsh,
+                                NEO::GraphicsAllocation *dsh,
-                                OCLRT::GraphicsAllocation *reflectionSurface,
+                                NEO::GraphicsAllocation *reflectionSurface,
-                                OCLRT::GraphicsAllocation *queueStorageBuffer,
+                                NEO::GraphicsAllocation *queueStorageBuffer,
-                                OCLRT::GraphicsAllocation *ssh,
+                                NEO::GraphicsAllocation *ssh,
-                                OCLRT::GraphicsAllocation *debugQueue);
+                                NEO::GraphicsAllocation *debugQueue);
 
     void cleanSchedulerSimulation();
 
     static void startScheduler(uint32_t index,
-                               OCLRT::GraphicsAllocation *queue,
+                               NEO::GraphicsAllocation *queue,
-                               OCLRT::GraphicsAllocation *commandsStack,
+                               NEO::GraphicsAllocation *commandsStack,
-                               OCLRT::GraphicsAllocation *eventsPool,
+                               NEO::GraphicsAllocation *eventsPool,
-                               OCLRT::GraphicsAllocation *secondaryBatchBuffer,
+                               NEO::GraphicsAllocation *secondaryBatchBuffer,
-                               OCLRT::GraphicsAllocation *dsh,
+                               NEO::GraphicsAllocation *dsh,
-                               OCLRT::GraphicsAllocation *reflectionSurface,
+                               NEO::GraphicsAllocation *reflectionSurface,
-                               OCLRT::GraphicsAllocation *queueStorageBuffer,
+                               NEO::GraphicsAllocation *queueStorageBuffer,
-                               OCLRT::GraphicsAllocation *ssh,
+                               NEO::GraphicsAllocation *ssh,
-                               OCLRT::GraphicsAllocation *debugQueue);
+                               NEO::GraphicsAllocation *debugQueue);
 
-    void initializeSchedulerSimulation(OCLRT::GraphicsAllocation *queue,
+    void initializeSchedulerSimulation(NEO::GraphicsAllocation *queue,
-                                       OCLRT::GraphicsAllocation *commandsStack,
+                                       NEO::GraphicsAllocation *commandsStack,
-                                       OCLRT::GraphicsAllocation *eventsPool,
+                                       NEO::GraphicsAllocation *eventsPool,
-                                       OCLRT::GraphicsAllocation *secondaryBatchBuffer,
+                                       NEO::GraphicsAllocation *secondaryBatchBuffer,
-                                       OCLRT::GraphicsAllocation *dsh,
+                                       NEO::GraphicsAllocation *dsh,
-                                       OCLRT::GraphicsAllocation *reflectionSurface,
+                                       NEO::GraphicsAllocation *reflectionSurface,
-                                       OCLRT::GraphicsAllocation *queueStorageBuffer,
+                                       NEO::GraphicsAllocation *queueStorageBuffer,
-                                       OCLRT::GraphicsAllocation *ssh,
+                                       NEO::GraphicsAllocation *ssh,
-                                       OCLRT::GraphicsAllocation *debugQueue);
+                                       NEO::GraphicsAllocation *debugQueue);
 
     static void patchGpGpuWalker(uint secondLevelBatchOffset,
                                  __global uint *secondaryBatchBuffer,

runtime/builtin_kernels_simulation/scheduler_simulation.inl

@@ -13,7 +13,7 @@
 #include <thread>
 
 using namespace std;
-using namespace OCLRT;
+using namespace NEO;
 
 namespace BuiltinKernelsSimulation {
 

runtime/command_queue/command_queue.cpp

@@ -37,7 +37,7 @@
 
 #include <map>
 
-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

runtime/command_queue/command_queue.h

@@ -17,7 +17,7 @@
 #include <atomic>
 #include <cstdint>
 
-namespace OCLRT {
+namespace NEO {
 class Buffer;
 class LinearStream;
 class Context;
@@ -481,4 +481,4 @@ LinearStream &getCommandStream(CommandQueue &commandQueue,
 
 template <typename GfxFamily, IndirectHeap::Type heapType>
 IndirectHeap &getIndirectHeap(CommandQueue &commandQueue, const Kernel &kernel);
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/command_queue_hw.h

@@ -19,7 +19,7 @@
 
 #include <memory>
 
-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> &printfHandler,
                                    Event *event,
-                                   TagNode<OCLRT::HwTimeStamps> *&hwTimeStamps,
+                                   TagNode<NEO::HwTimeStamps> *&hwTimeStamps,
                                    Kernel *parentKernel,
                                    bool blockQueue,
                                    DeviceQueueHw<GfxFamily> *devQueueHw,
@@ -375,4 +375,4 @@ class CommandQueueHw : public CommandQueue {
                                    TimestampPacketContainer &previousTimestampPacketNodes,
                                    PreemptionMode preemption);
 };
-} // namespace OCLRT
+} // namespace NEO

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 <typename Family>
 void CommandQueueHw<Family>::notifyEnqueueReadBuffer(Buffer *buffer, bool blockingRead) {
     if (DebugManager.flags.AUBDumpAllocsOnEnqueueReadOnly.get()) {
@@ -45,4 +45,4 @@ template <typename Family>
 bool CommandQueueHw<Family>::requiresCacheFlushAfterWalkerBasedOnProperties(const cl_queue_properties *properties) {
     return false;
 }
-} // namespace OCLRT
+} // namespace NEO

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<cl_mem>(transferProperties.memObj), transferProperties.ptr);
     }
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_barrier.h

@@ -16,7 +16,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueBarrierWithWaitList(
@@ -33,4 +33,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueBarrierWithWaitList(
                                        event);
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_common.h

@@ -37,7 +37,7 @@
 #include <algorithm>
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 template <uint32_t commandType, size_t surfaceCount>
@@ -98,7 +98,7 @@ void CommandQueueHw<GfxFamily>::enqueueHandler(Surface *(&surfaces)[surfaceCount
 }
 
 template <typename GfxFamily>
-void CommandQueueHw<GfxFamily>::forceDispatchScheduler(OCLRT::MultiDispatchInfo &multiDispatchInfo) {
+void CommandQueueHw<GfxFamily>::forceDispatchScheduler(NEO::MultiDispatchInfo &multiDispatchInfo) {
     BuiltIns &builtIns = *getDevice().getExecutionEnvironment()->getBuiltIns();
     SchedulerKernel &scheduler = builtIns.getSchedulerKernel(this->getContext());
     DispatchInfo dispatchInfo(&scheduler, 1, Vec3<size_t>(scheduler.getGws(), 1, 1), Vec3<size_t>(scheduler.getLws(), 1, 1), Vec3<size_t>(0, 0, 0));
@@ -780,4 +780,4 @@ size_t CommandQueueHw<GfxFamily>::calculateHostPtrSizeForImage(const size_t *reg
 
     return Image::calculateHostPtrSize(region, dstRowPitch, dstSlicePitch, bytesPerPixel, image->getImageDesc().image_type);
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_copy_buffer.h

@@ -18,7 +18,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueCopyBuffer(
@@ -59,4 +59,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyBuffer(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_copy_buffer_rect.h

@@ -15,7 +15,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueCopyBufferRect(
@@ -64,4 +64,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyBufferRect(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_copy_buffer_to_image.h

@@ -20,7 +20,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueCopyBufferToImage(
@@ -64,4 +64,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyBufferToImage(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_copy_image.h

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueCopyImage(
@@ -67,4 +67,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyImage(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_copy_image_to_buffer.h

@@ -20,7 +20,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueCopyImageToBuffer(
@@ -64,4 +64,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueCopyImageToBuffer(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_fill_buffer.h

@@ -19,7 +19,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueFillBuffer(
@@ -79,4 +79,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueFillBuffer(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_fill_image.h

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueFillImage(
@@ -59,4 +59,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueFillImage(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_kernel.h

@@ -19,7 +19,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueKernel(
@@ -143,4 +143,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueKernel(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_marker.h

@@ -17,7 +17,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueMarkerWithWaitList(
@@ -35,4 +35,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueMarkerWithWaitList(
                                       event);
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_migrate_mem_objects.h

@@ -15,7 +15,7 @@
 
 #include "hw_cmds.h"
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueMigrateMemObjects(cl_uint numMemObjects,
@@ -36,4 +36,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueMigrateMemObjects(cl_uint numMemObjects
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_read_buffer.h

@@ -19,7 +19,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueReadBuffer(
@@ -125,4 +125,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueReadBuffer(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_read_buffer_rect.h

@@ -16,7 +16,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueReadBufferRect(
@@ -117,4 +117,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueReadBufferRect(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_read_image.h

@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueReadImage(
@@ -124,4 +124,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueReadImage(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_svm.h

@@ -13,7 +13,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 using SvmFreeClbT = void(CL_CALLBACK *)(cl_command_queue queue,
                                         cl_uint numSvmPointers,
@@ -67,7 +67,7 @@ cl_int CommandQueueHw<GfxFamily>::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<GfxFamily>::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<GfxFamily>::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<GfxFamily>::enqueueSVMMigrateMem(cl_uint numSvmPointers,
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_write_buffer.h

@@ -18,7 +18,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueWriteBuffer(
@@ -123,4 +123,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueWriteBuffer(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_write_buffer_rect.h

@@ -15,7 +15,7 @@
 
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueWriteBufferRect(
@@ -113,4 +113,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueWriteBufferRect(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/enqueue_write_image.h

@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <new>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::enqueueWriteImage(
@@ -116,4 +116,4 @@ cl_int CommandQueueHw<GfxFamily>::enqueueWriteImage(
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/finish.h

@@ -12,7 +12,7 @@
 
 #include "hw_cmds.h"
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::finish(bool dcFlush) {
@@ -32,4 +32,4 @@ cl_int CommandQueueHw<GfxFamily>::finish(bool dcFlush) {
 
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 cl_int CommandQueueHw<GfxFamily>::flush() {
     getCommandStreamReceiver().flushBatchedSubmissions();
     return CL_SUCCESS;
 }
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 using WALKER_TYPE = typename GfxFamily::WALKER_TYPE;
@@ -143,50 +143,50 @@ class GpgpuWalkerHelper {
 
     static void dispatchProfilingCommandsStart(
         TagNode<HwTimeStamps> &hwTimeStamps,
-        OCLRT::LinearStream *commandStream);
+        NEO::LinearStream *commandStream);
 
     static void dispatchProfilingCommandsEnd(
         TagNode<HwTimeStamps> &hwTimeStamps,
-        OCLRT::LinearStream *commandStream);
+        NEO::LinearStream *commandStream);
 
     static void dispatchPerfCountersNoopidRegisterCommands(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream,
+        NEO::LinearStream *commandStream,
         bool start);
 
     static void dispatchPerfCountersReadFreqRegisterCommands(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream,
+        NEO::LinearStream *commandStream,
         bool start);
 
     static void dispatchPerfCountersGeneralPurposeCounterCommands(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream,
+        NEO::LinearStream *commandStream,
         bool start);
 
     static void dispatchPerfCountersUserCounterCommands(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream,
+        NEO::LinearStream *commandStream,
         bool start);
 
     static void dispatchPerfCountersOABufferStateCommands(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream);
+        NEO::LinearStream *commandStream);
 
     static void dispatchPerfCountersCommandsStart(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream);
+        NEO::LinearStream *commandStream);
 
     static void dispatchPerfCountersCommandsEnd(
         CommandQueue &commandQueue,
-        OCLRT::HwPerfCounter &hwPerfCounter,
+        NEO::HwPerfCounter &hwPerfCounter,
-        OCLRT::LinearStream *commandStream);
+        NEO::LinearStream *commandStream);
 
     static void setupTimestampPacket(
         LinearStream *cmdStream,
@@ -260,4 +260,4 @@ IndirectHeap &getIndirectHeap(CommandQueue &commandQueue, const MultiDispatchInf
     return *ih;
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/gpgpu_walker.inl

@@ -28,12 +28,12 @@
 #include <algorithm>
 #include <cmath>
 
-namespace OCLRT {
+namespace NEO {
 
 // Performs ReadModifyWrite operation on value of a register: Register = Register Operation Mask
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::addAluReadModifyWriteRegister(
-    OCLRT::LinearStream *pCommandStream,
+    NEO::LinearStream *pCommandStream,
     uint32_t aluRegister,
     uint32_t operation,
     uint32_t mask) {
@@ -105,7 +105,7 @@ void GpgpuWalkerHelper<GfxFamily>::addAluReadModifyWriteRegister(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchProfilingCommandsStart(
     TagNode<HwTimeStamps> &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<GfxFamily>::dispatchProfilingCommandsStart(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchProfilingCommandsEnd(
     TagNode<HwTimeStamps> &hwTimeStamps,
-    OCLRT::LinearStream *commandStream) {
+    NEO::LinearStream *commandStream) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
 
@@ -153,8 +153,8 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchProfilingCommandsEnd(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersNoopidRegisterCommands(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream,
+    NEO::LinearStream *commandStream,
     bool start) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
@@ -164,15 +164,15 @@ void GpgpuWalkerHelper<GfxFamily>::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 <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersReadFreqRegisterCommands(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream,
+    NEO::LinearStream *commandStream,
     bool start) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
@@ -182,15 +182,15 @@ void GpgpuWalkerHelper<GfxFamily>::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 <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersGeneralPurposeCounterCommands(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream,
+    NEO::LinearStream *commandStream,
     bool start) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
@@ -199,7 +199,7 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersGeneralPurposeCounterComm
                                        : reinterpret_cast<uint64_t>(&(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<GfxFamily>::dispatchPerfCountersGeneralPurposeCounterComm
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersUserCounterCommands(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream,
+    NEO::LinearStream *commandStream,
     bool start) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
@@ -254,8 +254,8 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersUserCounterCommands(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersOABufferStateCommands(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream) {
+    NEO::LinearStream *commandStream) {
 
     using MI_STORE_REGISTER_MEM = typename GfxFamily::MI_STORE_REGISTER_MEM;
 
@@ -285,8 +285,8 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersOABufferStateCommands(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersCommandsStart(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream) {
+    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<GfxFamily>::dispatchPerfCountersCommandsStart(
 template <typename GfxFamily>
 void GpgpuWalkerHelper<GfxFamily>::dispatchPerfCountersCommandsEnd(
     CommandQueue &commandQueue,
-    OCLRT::HwPerfCounter &hwPerfCounter,
+    NEO::HwPerfCounter &hwPerfCounter,
-    OCLRT::LinearStream *commandStream) {
+    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<GfxFamily>::dispatchPerfCountersCommandsEnd(
 }
 
 template <typename GfxFamily>
-void GpgpuWalkerHelper<GfxFamily>::applyWADisableLSQCROPERFforOCL(OCLRT::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) {
+void GpgpuWalkerHelper<GfxFamily>::applyWADisableLSQCROPERFforOCL(NEO::LinearStream *pCommandStream, const Kernel &kernel, bool disablePerfMode) {
 }
 
 template <typename GfxFamily>
@@ -429,7 +429,7 @@ size_t EnqueueOperation<GfxFamily>::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<GfxFamily>::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<GfxFamily>::getSizeRequiredForTimestampPacketWrite() {
     return sizeof(PIPE_CONTROL);
 }
 
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 inline size_t GpgpuWalkerHelper<GfxFamily>::setGpgpuWalkerThreadData(
@@ -181,4 +181,4 @@ void GpgpuWalkerHelper<GfxFamily>::setupTimestampPacket(
     }
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/hardware_interface.h

@@ -12,7 +12,7 @@
 
 #include <cstdint>
 
-namespace OCLRT {
+namespace NEO {
 
 class CommandQueue;
 class DispatchInfo;
@@ -100,4 +100,4 @@ class HardwareInterface {
                                                        const Kernel &kernel);
 };
 
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 inline WALKER_TYPE<GfxFamily> *HardwareInterface<GfxFamily>::allocateWalkerSpace(LinearStream &commandStream,
@@ -224,4 +224,4 @@ void HardwareInterface<GfxFamily>::dispatchWalker(
     dispatchProfilingPerfEndCommands(hwTimeStamps, hwPerfCounter, commandStream, commandQueue);
 }
 
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 inline void HardwareInterface<GfxFamily>::getDefaultDshSpace(
@@ -137,4 +137,4 @@ inline void HardwareInterface<GfxFamily>::programWalker(
                                                            *kernel.getKernelInfo().patchInfo.threadPayload);
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/local_id_gen.cpp

@@ -12,7 +12,7 @@
 
 #include <array>
 
-namespace OCLRT {
+namespace NEO {
 
 struct uint16x8_t;
 struct uint16x16_t;
@@ -114,4 +114,4 @@ inline void generateLocalIDsWithLayoutForImages(void *b, const std::array<uint16
         offset += 3 * rowWidth;
     }
 }
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/local_id_gen.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 @@
 #include <array>
 #include <cstdint>
 
-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<uint16_t, 3>
 void generateLocalIDsWithLayoutForImages(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t simd);
 
 bool isCompatibleWithLayoutForImages(const std::array<uint16_t, 3> &localWorkgroupSize, const std::array<uint8_t, 3> &dimensionsOrder, uint16_t simd);
-} // namespace OCLRT
+} // namespace NEO

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 <array>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename Vec, int simd>
 inline void generateLocalIDsSimd(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup,
@@ -149,4 +149,4 @@ inline void generateLocalIDsSimd(void *b, const std::array<uint16_t, 3> &localWo
 
     } while (++pass < passes);
 }
-} // namespace OCLRT
+} // namespace NEO

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 <array>
 
-namespace OCLRT {
+namespace NEO {
 template void generateLocalIDsSimd<uint16x16_t, 32>(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array<uint8_t, 3> &dimensionsOrder);
 template void generateLocalIDsSimd<uint16x16_t, 16>(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array<uint8_t, 3> &dimensionsOrder);
-} // namespace OCLRT
+} // namespace NEO
 #endif

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 <array>
 
-namespace OCLRT {
+namespace NEO {
 template void generateLocalIDsSimd<uint16x8_t, 32>(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array<uint8_t, 3> &dimensionsOrder);
 template void generateLocalIDsSimd<uint16x8_t, 16>(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array<uint8_t, 3> &dimensionsOrder);
 template void generateLocalIDsSimd<uint16x8_t, 8>(void *b, const std::array<uint16_t, 3> &localWorkgroupSize, uint16_t threadsPerWorkGroup, const std::array<uint8_t, 3> &dimensionsOrder);
-} // namespace OCLRT
+} // namespace NEO

runtime/command_queue/local_work_size.cpp

@@ -17,7 +17,7 @@
 #include <cstdint>
 #include <ctime>
 
-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

runtime/command_stream/aub_command_stream_receiver.cpp

@@ -18,7 +18,7 @@
 #include <cstring>
 #include <sstream>
 
-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;

runtime/command_stream/aub_command_stream_receiver.h

@@ -10,7 +10,7 @@
 
 #include <string>
 
-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

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<GfxFa
     uint32_t pollForCompletionTaskCount = 0u;
     SpinLock pollForCompletionLock;
 };
-} // namespace OCLRT
+} // namespace NEO

runtime/command_stream/aub_command_stream_receiver_hw.inl

@@ -33,7 +33,7 @@
 #include <algorithm>
 #include <cstring>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 AUBCommandStreamReceiverHw<GfxFamily>::AUBCommandStreamReceiverHw(const std::string &fileName, bool standalone, ExecutionEnvironment &executionEnvironment)
@@ -814,4 +814,4 @@ int AUBCommandStreamReceiverHw<GfxFamily>::getAddressSpaceFromPTEBits(uint64_t e
     return AubMemDump::AddressSpaceValues::TraceNonlocal;
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/command_stream/aub_stream_provider.h

@@ -10,7 +10,7 @@
 
 #include <string>
 
-namespace OCLRT {
+namespace NEO {
 
 class AubStreamProvider {
   public:
@@ -28,4 +28,4 @@ class AubFileStreamProvider : public AubStreamProvider {
   protected:
     AubMemDump::AubFileStream stream;
 };
-} // namespace OCLRT
+} // namespace NEO

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

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 <memory>
 #include <string>
 
-namespace OCLRT {
+namespace NEO {
 
 struct MultiDispatchInfo;
 class SettingsReader;
@@ -66,4 +66,4 @@ class AubSubCaptureManager {
     std::string currentFileName;
     std::unique_ptr<SettingsReader> settingsReader;
 };
-} // namespace OCLRT
+} // namespace NEO

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

runtime/command_stream/command_stream_receiver.h

@@ -21,7 +21,7 @@
 #include <cstddef>
 #include <cstdint>
 
-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

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 <typename GfxFamily>
 class DeviceCommandStreamReceiver;
 
@@ -106,4 +106,4 @@ class CommandStreamReceiverHw : public CommandStreamReceiver {
     bool localMemoryEnabled;
 };
 
-} // namespace OCLRT
+} // namespace NEO

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 <typename GfxFamily>
 size_t CommandStreamReceiverHw<GfxFamily>::getSshHeapSize() {
@@ -811,4 +811,4 @@ int CommandStreamReceiverHw<GfxFamily>::getRequiredPipeControlSize() const {
     const auto pipeControlCount = KernelCommandsHelper<GfxFamily>::isPipeControlWArequired() ? 2u : 1u;
     return pipeControlCount * sizeof(typename GfxFamily::PIPE_CONTROL);
 }
-} // namespace OCLRT
+} // namespace NEO

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<Gf
 
     AubMemDump::AubStream *stream;
 };
-} // namespace OCLRT
+} // namespace NEO

runtime/command_stream/command_stream_receiver_simulated_common_hw.inl

@@ -20,7 +20,7 @@
 #include "aub_mapper.h"
 #include "third_party/aub_stream/headers/aub_manager.h"
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename GfxFamily>
 void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::initGlobalMMIO() {
@@ -137,4 +137,4 @@ void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::freeEngineInfo(AddressMa
     engineInfo.pRingBuffer = nullptr;
 }
 
-} // namespace OCLRT
+} // namespace NEO

runtime/command_stream/command_stream_receiver_with_aub_dump.h

@@ -10,7 +10,7 @@
 
 #include <memory>
 
-namespace OCLRT {
+namespace NEO {
 
 template <typename BaseCSR>
 class CommandStreamReceiverWithAUBDump : public BaseCSR {
@@ -32,4 +32,4 @@ class CommandStreamReceiverWithAUBDump : public BaseCSR {
     std::unique_ptr<CommandStreamReceiver> aubCSR;
 };
 
-} // namespace OCLRT
+} // namespace NEO