Simplify parsing affinity mask

Signed-off-by: Bartosz Dunajski <[email protected]>

Author: BartoszDunajski

opencl/source/helpers/CMakeLists.txt

@@ -45,7 +45,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/queue_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.h
     ${CMAKE_CURRENT_SOURCE_DIR}/task_information.cpp

opencl/source/program/create.inl

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,10 +8,10 @@
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/constants.h"
+#include "shared/source/helpers/string_helpers.h"
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/string_helpers.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/source/program/program.h"
 
@@ -65,7 +65,7 @@ T *Program::create(
     size_t combinedStringSize = 0;
     T *program = nullptr;
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         combinedString,
         combinedStringSize,
         count,

opencl/test/unit_test/utilities/file_logger_tests.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -8,9 +8,9 @@
 #pragma once
 
 #include "shared/source/helpers/file_io.h"
+#include "shared/source/helpers/string_helpers.h"
 #include "shared/source/utilities/directory.h"
 
-#include "opencl/source/helpers/string_helpers.h"
 #include "opencl/source/utilities/logger.h"
 
 #include <map>

shared/source/execution_environment/execution_environment.cpp

@@ -12,6 +12,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/affinity_mask.h"
 #include "shared/source/helpers/hw_helper.h"
+#include "shared/source/helpers/string_helpers.h"
 #include "shared/source/memory_manager/memory_manager.h"
 #include "shared/source/memory_manager/os_agnostic_memory_manager.h"
 #include "shared/source/os_interface/os_environment.h"
@@ -84,8 +85,9 @@ void ExecutionEnvironment::prepareRootDeviceEnvironments(uint32_t numRootDevices
         }
     }
 }
+
 void ExecutionEnvironment::parseAffinityMask() {
-    auto affinityMaskString = DebugManager.flags.ZE_AFFINITY_MASK.get();
+    const auto &affinityMaskString = DebugManager.flags.ZE_AFFINITY_MASK.get();
 
     if (affinityMaskString.compare("default") == 0 ||
         affinityMaskString.empty()) {
@@ -96,33 +98,25 @@ void ExecutionEnvironment::parseAffinityMask() {
 
     std::vector<AffinityMaskHelper> affinityMaskHelper(numRootDevices);
 
-    size_t pos = 0;
-    while (pos < affinityMaskString.size()) {
-        size_t posNextDot = affinityMaskString.find_first_of(".", pos);
-        size_t posNextComma = affinityMaskString.find_first_of(",", pos);
-        std::string rootDeviceString = affinityMaskString.substr(pos, std::min(posNextDot, posNextComma) - pos);
-        uint32_t rootDeviceIndex = static_cast<uint32_t>(std::stoul(rootDeviceString, nullptr, 0));
+    auto affinityMaskEntries = StringHelpers::split(affinityMaskString, ",");
+
+    for (const auto &entry : affinityMaskEntries) {
+        auto subEntries = StringHelpers::split(entry, ".");
+        uint32_t rootDeviceIndex = StringHelpers::toUint32t(subEntries[0]);
+
         if (rootDeviceIndex < numRootDevices) {
             auto hwInfo = rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo();
             auto subDevicesCount = HwHelper::getSubDevicesCount(hwInfo);
 
-            pos += rootDeviceString.size();
-            if (posNextDot != std::string::npos &&
-                affinityMaskString.at(pos) == '.' && posNextDot < posNextComma) {
-                pos++;
-                std::string subDeviceString = affinityMaskString.substr(pos, posNextComma - pos);
-                uint32_t subDeviceIndex = static_cast<uint32_t>(std::stoul(subDeviceString, nullptr, 0));
+            if (subEntries.size() == 2) {
+                uint32_t subDeviceIndex = StringHelpers::toUint32t(subEntries[1]);
                 if (subDeviceIndex < subDevicesCount) {
                     affinityMaskHelper[rootDeviceIndex].enableGenericSubDevice(subDeviceIndex);
                 }
             } else {
                 affinityMaskHelper[rootDeviceIndex].enableAllGenericSubDevices(subDevicesCount);
             }
         }
-        if (posNextComma == std::string::npos) {
-            break;
-        }
-        pos = posNextComma + 1;
     }
 
     std::vector<std::unique_ptr<RootDeviceEnvironment>> filteredEnvironments;

shared/source/helpers/CMakeLists.txt

@@ -96,6 +96,7 @@ set(NEO_CORE_HELPERS
     ${CMAKE_CURRENT_SOURCE_DIR}/state_compute_mode_helper.h
     ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h
     ${CMAKE_CURRENT_SOURCE_DIR}/string.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/surface_format_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_offsets.h
     ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.cpp

shared/source/helpers/affinity_mask.h

@@ -12,6 +12,7 @@
 
 #include <array>
 #include <bitset>
+#include <string>
 #include <vector>
 
 namespace NEO {

opencl/source/helpers/string_helpers.h shared/source/helpers/string_helpers.hopencl/source/helpers/string_helpers.h renamed to shared/source/helpers/string_helpers.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,8 @@
 #include <cstring>
 #include <string>
 
-const int maximalStackSizeSizes = 16;
+namespace StringHelpers {
+constexpr int maximalStackSizeSizes = 16;
 
 inline int createCombinedString(
     std::string &dstString,
@@ -28,7 +29,7 @@ inline int createCombinedString(
         retVal = CL_INVALID_VALUE;
     }
 
-    using SourceSizesT = StackVec<size_t, maximalStackSizeSizes>;
+    using SourceSizesT = StackVec<size_t, StringHelpers::maximalStackSizeSizes>;
     SourceSizesT localSizes;
 
     if (retVal == CL_SUCCESS) {
@@ -61,3 +62,25 @@ inline int createCombinedString(
 
     return retVal;
 }
+
+inline std::vector<std::string> split(const std::string &input, const char *delimiter) {
+    std::vector<std::string> outVector;
+    size_t pos = 0;
+
+    while (pos < input.size()) {
+        size_t nextDelimiter = input.find_first_of(delimiter, pos);
+        outVector.emplace_back(input.substr(pos, std::min(nextDelimiter, input.size()) - pos));
+
+        pos = nextDelimiter;
+        if (pos != std::string::npos) {
+            pos++;
+        }
+    }
+
+    return outVector;
+}
+
+inline uint32_t toUint32t(const std::string &input) {
+    return static_cast<uint32_t>(std::stoul(input, nullptr, 0));
+}
+} // namespace StringHelpers

shared/test/common/helpers/string_to_hash_tests.cpp

@@ -6,8 +6,7 @@
  */
 
 #include "shared/source/helpers/hash.h"
-
-#include "opencl/source/helpers/string_helpers.h"
+#include "shared/source/helpers/string_helpers.h"
 
 #include "gtest/gtest.h"
 
@@ -21,7 +20,7 @@ TEST(CreateCombinedStrings, GivenSingleStringWhenCreatingCombinedStringThenDstSt
     auto srcStrings = &pSrcString;
     size_t lengths = strlen(srcString);
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         1,
@@ -41,7 +40,7 @@ TEST(CreateCombinedStrings, GivenNullLengthWhenCreatingCombinedStringThenDstStri
     const char *pSrcString = srcString;
     auto srcStrings = &pSrcString;
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         1,
@@ -60,7 +59,7 @@ TEST(CreateCombinedStrings, GivenZeroLengthWhenCreatingCombinedStringThenDstStri
     auto srcStrings = &pSrcString;
     size_t lengths = 0;
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         1,
@@ -81,7 +80,7 @@ TEST(CreateCombinedStrings, GivenMultiStringWhenCreatingCombinedStringThenDstStr
     auto srcStrings = &srcString[0];
     size_t lengths[2] = {strlen(srcString[0]), strlen(srcString[1])};
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         2,
@@ -100,7 +99,7 @@ TEST(CreateCombinedStrings, GivenMultiStringAndNullLengthWhenCreatingCombinedStr
     combined += srcString[1];
     auto srcStrings = &srcString[0];
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         2,
@@ -120,7 +119,7 @@ TEST(CreateCombinedStrings, GivenMultiStringAndZeroLengthWhenCreatingCombinedStr
     auto srcStrings = &srcString[0];
     size_t lengths[2] = {0, strlen(srcString[1])};
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         2,
@@ -140,7 +139,7 @@ TEST(CreateCombinedStrings, GivenMultipleStringsIncludingOneWithErrorWhenCreatin
     std::string combined(expString[0]);
     combined += expString[1];
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         2,
@@ -160,15 +159,15 @@ TEST(CreateCombinedStrings, GivenInvalidInputWhenCreatingCombinedStringThenInval
     const char *srcStrings[2] = {srcString[0], srcString[1]};
     size_t lengths[2] = {0, strlen(srcString[1])};
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         0,
         srcStrings,
         lengths);
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
-    retVal = createCombinedString(
+    retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         1,
@@ -177,7 +176,7 @@ TEST(CreateCombinedStrings, GivenInvalidInputWhenCreatingCombinedStringThenInval
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 
     srcStrings[0] = nullptr;
-    retVal = createCombinedString(
+    retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
         2,
@@ -190,17 +189,17 @@ TEST(CreateCombinedStrings, GivenMultipleStringThatCountIsHigherThanMaximalStack
     std::string dstString;
     size_t dstStringSizeInBytes = 0;
     const char *defaultString = "hello";
-    const char *srcString[maximalStackSizeSizes + 2];
+    const char *srcString[StringHelpers::maximalStackSizeSizes + 2];
     std::string combinedString;
-    for (int i = 0; i < maximalStackSizeSizes + 2; i++) {
+    for (int i = 0; i < StringHelpers::maximalStackSizeSizes + 2; i++) {
         srcString[i] = defaultString;
         combinedString += defaultString;
     }
 
-    auto retVal = createCombinedString(
+    auto retVal = StringHelpers::createCombinedString(
         dstString,
         dstStringSizeInBytes,
-        maximalStackSizeSizes + 2,
+        StringHelpers::maximalStackSizeSizes + 2,
         srcString,
         nullptr);