Rename DeviceHelper to ClDeviceHelper

Related-To: NEO-3938

Change-Id: I6c518c25d9868d7a94a20d3a1fcaf9a3631ebc0b
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

runtime/device/device_info.cpp

@@ -13,7 +13,7 @@
 #include "runtime/device/cl_device_vector.h"
 #include "runtime/device/device.h"
 #include "runtime/device/device_info_map.h"
-#include "runtime/helpers/device_helpers.h"
+#include "runtime/helpers/cl_device_helpers.h"
 #include "runtime/platform/platform.h"
 
 using DeviceInfoTable::Map;
@@ -193,7 +193,7 @@ cl_int ClDevice::getDeviceInfo(cl_device_info paramName,
         if (device.getDeviceInfo().imageSupport && getDeviceInfoForImage(paramName, src, srcSize, retSize)) {
             break;
         }
-        DeviceHelper::getExtraDeviceInfo(*this, paramName, param, src, srcSize, retSize);
+        ClDeviceHelper::getExtraDeviceInfo(*this, paramName, param, src, srcSize, retSize);
     }
 
     retVal = ::getInfo(paramValue, paramValueSize, src, srcSize);

runtime/helpers/CMakeLists.txt

@@ -14,9 +14,10 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/built_ins_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_blit_properties.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/cl_device_helpers.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/cl_device_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/cl_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/convert_color.h
-  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/device_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.h
   ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h

runtime/helpers/cl_device_helpers.cpp

@@ -0,0 +1,12 @@
+/*
+ * Copyright (C) 2018-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "runtime/helpers/cl_device_helpers.h"
+
+namespace NEO {
+void ClDeviceHelper::getExtraDeviceInfo(const ClDevice &clDevice, cl_device_info paramName, cl_uint &param, const void *&src, size_t &size, size_t &retSize) {}
+} // namespace NEO

runtime/helpers/cl_device_helpers.h

@@ -11,9 +11,8 @@
 #include <cstdint>
 namespace NEO {
 class ClDevice;
-struct HardwareInfo;
 
-namespace DeviceHelper {
+namespace ClDeviceHelper {
 void getExtraDeviceInfo(const ClDevice &clDevice, cl_device_info paramName, cl_uint &param, const void *&src, size_t &size, size_t &retSize);
-}; // namespace DeviceHelper
+}; // namespace ClDeviceHelper
 } // namespace NEO

runtime/helpers/device_helpers.cpp

@@ -1,12 +0,0 @@
-/*
- * Copyright (C) 2018-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#include "runtime/helpers/device_helpers.h"
-
-namespace NEO {
-void DeviceHelper::getExtraDeviceInfo(const ClDevice &clDevice, cl_device_info paramName, cl_uint &param, const void *&src, size_t &size, size_t &retSize) {}
-} // namespace NEO

unit_tests/perf_tests/fixtures/device_fixture.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ using NEO::HardwareInfo;
 using NEO::platformDevices;
 
 void DeviceFixture::SetUp() {
-    pDevice = DeviceHelper<>::create();
+    pDevice = ClDeviceHelper<>::create();
     ASSERT_NE(nullptr, pDevice);
 
     auto &commandStreamReceiver = pDevice->getGpgpuCommandStreamReceiver();

unit_tests/perf_tests/fixtures/device_fixture.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ struct DeviceDefaults {
 };
 
 template <typename DeviceTraits = DeviceDefaults>
-struct DeviceHelper {
+struct ClDeviceHelper {
     static NEO::Device *create(const NEO::HardwareInfo *hardwareInfo = nullptr) {
         auto device = NEO::Device::create(hardwareInfo);
         assert(device != nullptr);