Change namespace from OCLRT to NEO

Change-Id: If965c79d70392db26597aea4c2f3b7ae2820fe96 Signed-off-by: Maciej Plewka <maciej.plewka@intel.com>
2026-01-05 09:09:04 +08:00 · 2019-03-26 11:59:46 +01:00
parent 31e6005fa3
commit 9e52684f5b
1567 changed files with 3459 additions and 4009 deletions
--- 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 <cstdlib>

-namespace OCLRT {
+namespace NEO {
 void abortExecution() {
    abort();
 }
-} // namespace OCLRT
+} // namespace NEO
--- 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();
 }
--- 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 <stdint.h>

-namespace OCLRT {
+namespace NEO {

 enum PatchInfoAllocationType {
    Default = 0,
@@ -76,4 +76,4 @@ struct CommandChunk {
    uint64_t batchBufferStartLocation = 0;
    uint64_t batchBufferStartAddress = 0;
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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
--- a/runtime/helpers/base_object.h
+++ b/runtime/helpers/base_object.h
@@ -19,7 +19,7 @@
 #include <mutex>
 #include <thread>

-namespace OCLRT {
+namespace NEO {

 #if defined(__clang__)
 #define NO_SANITIZE __attribute__((no_sanitize("undefined")))
@@ -257,4 +257,4 @@ class BaseObject : public B, public ReferenceTrackedObject<DerivedType_t<B>> {
 template <typename Type>
 void populateFactoryTable();

-} // namespace OCLRT
+} // namespace NEO
--- 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 <typename B>
 void *BaseObject<B>::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
--- 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
--- 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<char> &binary,
                             size_t size,
                             cl_int *errcodeRet);
-} // namespace OCLRT
+} // namespace NEO
--- 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<MemoryConstants::cacheLineSize>(ptr) &&
           isAligned<MemoryConstants::cacheLineSize>(size);
 }

-bool isL3Capable(const OCLRT::GraphicsAllocation &graphicsAllocation) {
+bool isL3Capable(const NEO::GraphicsAllocation &graphicsAllocation) {
    auto ptr = ptrOffset(graphicsAllocation.getUnderlyingBuffer(), static_cast<size_t>(graphicsAllocation.getAllocationOffset()));
    return isL3Capable(ptr, graphicsAllocation.getUnderlyingBufferSize());
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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
--- a/runtime/helpers/cl_helper.h
+++ b/runtime/helpers/cl_helper.h
@@ -10,7 +10,7 @@

 #include <string>

-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
--- a/runtime/helpers/completion_stamp.h
+++ b/runtime/helpers/completion_stamp.h
@@ -10,11 +10,11 @@

 #include <cstdint>

-namespace OCLRT {
+namespace NEO {
 typedef uint64_t FlushStamp;
 struct CompletionStamp {
    uint32_t taskCount;
    uint32_t taskLevel;
    FlushStamp flushStamp;
 };
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/convert_color.h
+++ b/runtime/helpers/convert_color.h
@@ -12,7 +12,7 @@

 #include <utility>

-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
--- 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 &currentCsr,
                                                           DependenciesType depsType) {
@@ -35,4 +35,4 @@ void CsrDependencies::fillFromEventsRequestAndMakeResident(const EventsRequest &
        }
    }
 }
-} // namespace OCLRT
+} // namespace NEO
--- 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<TimestampPacketContainer *, 32> {
                                              CommandStreamReceiver &currentCsr,
                                              DependenciesType depsType);
 };
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/debug_helpers.cpp
+++ b/runtime/helpers/debug_helpers.cpp
@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <cstdio>

-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
+} // namespace NEO
--- 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
--- 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 &param, 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
--- a/runtime/helpers/device_helpers.h
+++ b/runtime/helpers/device_helpers.h
@@ -9,11 +9,11 @@
 #include "CL/cl.h"

 #include <cstdint>
-namespace OCLRT {
+namespace NEO {
 struct HardwareInfo;

 namespace DeviceHelper {
 void getExtraDeviceInfo(cl_device_info paramName, cl_uint &param, const void *&src, size_t &size, size_t &retSize);
 uint32_t getDevicesCount(const HardwareInfo *pHwInfo);
 }; // namespace DeviceHelper
-} // namespace OCLRT
+} // namespace NEO
--- 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()) {
--- a/runtime/helpers/dirty_state_helpers.h
+++ b/runtime/helpers/dirty_state_helpers.h
@@ -9,7 +9,7 @@
 #include <cstdint>
 #include <cstdlib>

-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
--- 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
--- a/runtime/helpers/dispatch_info.h
+++ b/runtime/helpers/dispatch_info.h
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <memory>

-namespace OCLRT {
+namespace NEO {

 class Kernel;

@@ -169,4 +169,4 @@ struct MultiDispatchInfo {
    StackVec<MemObj *, 2> redescribedSurfaces;
    Kernel *mainKernel = nullptr;
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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
--- 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 <PRODUCT_FAMILY gfxProduct>
 struct EnableGfxProductHw {
    typedef typename HwMapper<gfxProduct>::GfxProduct GfxProduct;
@@ -21,4 +21,4 @@ struct EnableGfxProductHw {
        hardwareInfoSetup[gfxProduct] = GfxProduct::setupHardwareInfo;
    }
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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
--- 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<PatchInfoData> &d
 MemoryManager *FlatBatchBufferHelper::getMemoryManager() const {
    return executionEnvironemnt.memoryManager.get();
 }
-}; // namespace OCLRT
+}; // namespace NEO
--- a/runtime/helpers/flat_batch_buffer_helper.h
+++ b/runtime/helpers/flat_batch_buffer_helper.h
@@ -13,7 +13,7 @@
 #include <map>
 #include <vector>

-namespace OCLRT {
+namespace NEO {

 enum class DispatchMode;
 class MemoryManager;
@@ -47,4 +47,4 @@ class FlatBatchBufferHelper {
    std::map<uint64_t, uint64_t> batchBufferStartAddressSequence;
 };

-} // namespace OCLRT
+} // namespace NEO
--- 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 <typename GfxFamily>
 class FlatBatchBufferHelperHw : public FlatBatchBufferHelper {
@@ -20,4 +20,4 @@ class FlatBatchBufferHelperHw : public FlatBatchBufferHelper {
    void removePipeControlData(size_t pipeControlLocationSize, void *pipeControlForNooping) override;
 };

-} // namespace OCLRT
+} // namespace NEO
--- 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 <typename GfxFamily>
 GraphicsAllocation *FlatBatchBufferHelperHw<GfxFamily>::flattenBatchBuffer(BatchBuffer &batchBuffer, size_t &sizeBatchBuffer,
@@ -190,4 +190,4 @@ void FlatBatchBufferHelperHw<GfxFamily>::removePipeControlData(size_t pipeContro
    }
 }

-}; // namespace OCLRT
+}; // namespace NEO
--- 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) {
--- 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<FlushStampTrackingObj> {
    FlushStamp flushStamp = 0;
    std::atomic<bool> initialized{false};
@@ -45,4 +45,4 @@ class FlushStampUpdateHelper {
  private:
    StackVec<FlushStampTrackingObj *, 64> flushStampsToUpdate;
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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 <cstdint>

-namespace OCLRT {
+namespace NEO {

 template <typename GfxFamily>
 struct DeviceCallbacks {
@@ -22,4 +22,4 @@ struct TTCallbacks {
    static int __stdcall writeL3Address(void *queueHandle, uint64_t l3GfxAddress, uint64_t regOffset);
 };

-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/gmm_callbacks.inl
+++ b/runtime/helpers/gmm_callbacks.inl
@@ -11,7 +11,7 @@

 #include <cstdint>

-namespace OCLRT {
+namespace NEO {

 template <typename GfxFamily>
 long __stdcall DeviceCallbacks<GfxFamily>::notifyAubCapture(void *csrHandle, uint64_t gfxAddress, size_t gfxSize, bool allocate) {
@@ -23,4 +23,4 @@ int __stdcall TTCallbacks<GfxFamily>::writeL3Address(void *queueHandle, uint64_t
    return 0;
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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();
--- a/runtime/helpers/hardware_context_controller.h
+++ b/runtime/helpers/hardware_context_controller.h
@@ -12,7 +12,7 @@
 #include <memory>
 #include <vector>

-namespace OCLRT {
+namespace NEO {
 class OsContext;

 class HardwareContextController {
@@ -31,4 +31,4 @@ class HardwareContextController {

    std::vector<std::unique_ptr<aub_stream::HardwareContext>> hardwareContexts;
 };
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/hash.h
+++ b/runtime/helpers/hash.h
@@ -11,7 +11,7 @@

 #include <cstdint>

-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<uint32_t>(asInt);
 }
-} // namespace OCLRT
+} // namespace NEO
--- 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
--- a/runtime/helpers/hw_helper.h
+++ b/runtime/helpers/hw_helper.h
@@ -17,7 +17,7 @@
 #include <string>
 #include <type_traits>

-namespace OCLRT {
+namespace NEO {
 class ExecutionEnvironment;
 class GraphicsAllocation;
 struct HardwareCapabilities;
@@ -200,4 +200,4 @@ union SURFACE_STATE_BUFFER_LENGTH {
    } SurfaceState;
 };

-} // namespace OCLRT
+} // namespace NEO
--- 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 <typename Family>
 void HwHelperHw<Family>::setCapabilityCoherencyFlag(const HardwareInfo *pHwInfo, bool &coherencyFlag) {
@@ -209,4 +209,4 @@ typename Family::PIPE_CONTROL *PipeControlHelper<Family>::obtainPipeControlAndPr
    return pipeControl;
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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<EngineType>(DebugManager.flags.NodeOrdinal.get());
 }
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/hw_info.h
+++ b/runtime/helpers/hw_info.h
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <string>

-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
--- a/runtime/helpers/kernel_commands.h
+++ b/runtime/helpers/kernel_commands.h
@@ -18,7 +18,7 @@
 #include <cstddef>
 #include <cstdint>

-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
--- a/runtime/helpers/kernel_commands.inl
+++ b/runtime/helpers/kernel_commands.inl
@@ -20,7 +20,7 @@

 #include <cstring>

-namespace OCLRT {
+namespace NEO {

 template <typename GfxFamily>
 bool KernelCommandsHelper<GfxFamily>::isPipeControlWArequired() { return false; }
@@ -420,4 +420,4 @@ bool KernelCommandsHelper<GfxFamily>::kernelUsesLocalIds(const Kernel &kernel) {
            kernel.getKernelInfo().patchInfo.threadPayload->LocalIDZPresent);
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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 GfxFamily>
 typename KernelCommandsHelper<GfxFamily>::INTERFACE_DESCRIPTOR_DATA *KernelCommandsHelper<GfxFamily>::getInterfaceDescriptor(
@@ -170,4 +170,4 @@ void KernelCommandsHelper<GfxFamily>::programCacheFlushAfterWalkerCommand(Linear
    pipeControl->setCommandStreamerStallEnable(true);
    pipeControl->setDcFlushEnable(true);
 }
-} // namespace OCLRT
+} // namespace NEO
--- 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
+} // namespace NEO
--- a/runtime/helpers/kmd_notify_properties.cpp
+++ b/runtime/helpers/kmd_notify_properties.cpp
@@ -11,7 +11,7 @@

 #include <cstdint>

-using namespace OCLRT;
+using namespace NEO;

 bool KmdNotifyHelper::obtainTimeoutParams(int64_t &timeoutValueOutput,
                                          bool quickKmdSleepRequest,
--- a/runtime/helpers/kmd_notify_properties.h
+++ b/runtime/helpers/kmd_notify_properties.h
@@ -12,7 +12,7 @@
 #include <chrono>
 #include <cstdint>

-namespace OCLRT {
+namespace NEO {
 struct KmdNotifyProperties {
    int64_t delayKmdNotifyMicroseconds;
    int64_t delayQuickKmdSleepMicroseconds;
@@ -64,4 +64,4 @@ class KmdNotifyHelper {
    std::atomic<bool> acLineConnected{true};
    bool maxPowerSavingMode = false;
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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() {}

--- 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 <cstdint>
 #include <limits>

-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<uint32_t>(bytesPerPixel * offset);
 }
-} // namespace OCLRT
+} // namespace NEO
--- 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 <cstdint>

-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
--- a/runtime/helpers/options.cpp
+++ b/runtime/helpers/options.cpp
@@ -13,7 +13,7 @@

 #include <cstddef>

-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
--- 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
--- a/runtime/helpers/per_thread_data.cpp
+++ b/runtime/helpers/per_thread_data.cpp
@@ -12,7 +12,7 @@

 #include <array>

-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
--- a/runtime/helpers/per_thread_data.h
+++ b/runtime/helpers/per_thread_data.h
@@ -14,7 +14,7 @@
 #include <cstddef>
 #include <cstdint>

-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
--- 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 <cstdint>

-namespace OCLRT {
+namespace NEO {
 const uint32_t pipelineSelectEnablePipelineSelectMaskBits = 0x3;
 const uint32_t pipelineSelectMediaSamplerDopClockGateMaskBits = 0x10;
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/preamble.h
+++ b/runtime/helpers/preamble.h
@@ -13,7 +13,7 @@
 #include <cstddef>
 #include <cstdint>

-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
--- a/runtime/helpers/preamble.inl
+++ b/runtime/helpers/preamble.inl
@@ -17,7 +17,7 @@

 #include <cstddef>

-namespace OCLRT {
+namespace NEO {

 template <typename GfxFamily>
 void PreambleHelper<GfxFamily>::programThreadArbitration(LinearStream *pCommandStream, uint32_t requiredThreadArbitrationPolicy) {
@@ -121,4 +121,4 @@ uint32_t PreambleHelper<GfxFamily>::getMaxThreadsForVfe(const HardwareInfo &hwIn
    return hwInfo.pSysInfo->EUCount * threadsPerEU;
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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
--- a/runtime/helpers/properties_helper.h
+++ b/runtime/helpers/properties_helper.h
@@ -12,7 +12,7 @@
 #include <array>
 #include <unordered_set>

-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
--- 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
--- 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
--- a/runtime/helpers/state_base_address.h
+++ b/runtime/helpers/state_base_address.h
@@ -9,7 +9,7 @@
 #include <cstddef>
 #include <cstdint>

-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
--- 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 <typename GfxFamily>
 void StateBaseAddressHelper<GfxFamily>::programStateBaseAddress(
    LinearStream &commandStream,
@@ -82,4 +82,4 @@ void StateBaseAddressHelper<GfxFamily>::programBindingTableBaseAddress(LinearStr
    UNRECOVERABLE_IF(sbaCommand->getSurfaceStateBaseAddress() != ssh.getGraphicsAllocation()->getGpuAddress());
 }

-} // namespace OCLRT
+} // namespace NEO
--- 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<const SurfaceFormatInfo> SurfaceFormats::surfaceFormats(cl_mem_flags fl
 }

 ArrayRef<const SurfaceFormatInfo> 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<const SurfaceFormatInfo> SurfaceFormats::surfaceFormats(cl_mem_flags fl
 }

 // clang-format on
-} // namespace OCLRT
+} // namespace NEO
--- 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<const SurfaceFormatInfo> surfaceFormats(cl_mem_flags flags, const cl_image_format *imageFormat) noexcept;
 };

-} // namespace OCLRT
+} // namespace NEO
--- 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<GraphicsAllocation>(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
--- a/runtime/helpers/task_information.h
+++ b/runtime/helpers/task_information.h
@@ -16,7 +16,7 @@
 #include <memory>
 #include <vector>

-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
--- 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);
--- a/runtime/helpers/timestamp_packet.h
+++ b/runtime/helpers/timestamp_packet.h
@@ -17,7 +17,7 @@
 #include <cstdint>
 #include <vector>

-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
--- a/runtime/helpers/uint16_avx2.h
+++ b/runtime/helpers/uint16_avx2.h
@@ -12,7 +12,7 @@
 #include <cstdint>
 #include <immintrin.h>

-namespace OCLRT {
+namespace NEO {

 #if __AVX2__
 struct uint16x16_t {
@@ -109,4 +109,4 @@ struct uint16x16_t {
    }
 };
 #endif // __AVX2__
-} // namespace OCLRT
+} // namespace NEO
--- a/runtime/helpers/uint16_sse4.h
+++ b/runtime/helpers/uint16_sse4.h
@@ -12,7 +12,7 @@
 #include <cstdint>
 #include <immintrin.h>

-namespace OCLRT {
+namespace NEO {

 struct uint16x8_t {
    enum { numChannels = 8 };
@@ -107,4 +107,4 @@ struct uint16x8_t {
        return result;
    }
 };
-} // namespace OCLRT
+} // namespace NEO
--- 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
--- a/runtime/helpers/validators.h
+++ b/runtime/helpers/validators.h
@@ -12,7 +12,7 @@

 #include <utility>

-namespace OCLRT {
+namespace NEO {

 // Provide some aggregators...
 typedef std::pair<uint32_t, const cl_event *> EventWaitList;
@@ -25,7 +25,7 @@ enum PatternSize : size_t;

 template <typename CLType, typename InternalType>
 CLType WithCastToInternal(CLType clObject, InternalType **internalObject) {
-    *internalObject = OCLRT::castToObject<InternalType>(clObject);
+    *internalObject = NEO::castToObject<InternalType>(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
--- 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
--- 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 = {};