Use independent Elf UUID generation

Signed-off-by: Matias Cabral <[email protected]>

Author: matcabral

opencl/test/unit_test/os_interface/linux/CMakeLists.txt

@@ -27,6 +27,7 @@ set(IGDRCL_SRCS_tests_os_interface_linux
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_residency_handler_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_system_info_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/drm_tests.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_uuid_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_linux_tests.h

opencl/test/unit_test/os_interface/linux/drm_mock.h

@@ -33,6 +33,7 @@ class DrmMock : public Drm {
     using Drm::checkQueueSliceSupport;
     using Drm::classHandles;
     using Drm::engineInfo;
+    using Drm::generateElfUUID;
     using Drm::generateUUID;
     using Drm::getQueueSliceCount;
     using Drm::memoryInfo;

opencl/test/unit_test/os_interface/linux/drm_tests.cpp

@@ -390,23 +390,6 @@ TEST(DrmTest, givenPlatformWithSupportToChangeSliceCountWhenCallSetQueueSliceCou
     EXPECT_EQ(drm->getSliceMask(newSliceCount), sseu.slice_mask);
 }
 
-TEST(DrmTest, GivenDrmWhenGeneratingUUIDThenCorrectStringsAreReturned) {
-    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
-    executionEnvironment->prepareRootDeviceEnvironments(1);
-    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
-    auto uuid1 = drm.generateUUID();
-    auto uuid2 = drm.generateUUID();
-
-    std::string uuidff;
-    for (int i = 0; i < 0xff - 2; i++) {
-        uuidff = drm.generateUUID();
-    }
-
-    EXPECT_STREQ("00000000-0000-0000-0000-000000000001", uuid1.c_str());
-    EXPECT_STREQ("00000000-0000-0000-0000-000000000002", uuid2.c_str());
-    EXPECT_STREQ("00000000-0000-0000-0000-0000000000ff", uuidff.c_str());
-}
-
 namespace NEO {
 namespace SysCalls {
 extern uint32_t closeFuncCalled;

opencl/test/unit_test/os_interface/linux/drm_uuid_tests.cpp

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "opencl/test/unit_test/os_interface/linux/drm_mock.h"
+
+#include "gtest/gtest.h"
+
+using namespace NEO;
+
+TEST(DrmUuidTest, GivenDrmWhenGeneratingUUIDThenCorrectStringsAreReturned) {
+    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
+    auto uuid1 = drm.generateUUID();
+    auto uuid2 = drm.generateUUID();
+
+    std::string uuidff;
+    for (int i = 0; i < 0xff - 2; i++) {
+        uuidff = drm.generateUUID();
+    }
+
+    EXPECT_STREQ("00000000-0000-0000-0000-000000000001", uuid1.c_str());
+    EXPECT_STREQ("00000000-0000-0000-0000-000000000002", uuid2.c_str());
+    EXPECT_STREQ("00000000-0000-0000-0000-0000000000ff", uuidff.c_str());
+}
+
+TEST(DrmUuidTest, GivenDrmWhenGeneratingElfUUIDThenCorrectStringsAreReturned) {
+    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
+    executionEnvironment->prepareRootDeviceEnvironments(1);
+    DrmMock drm{*executionEnvironment->rootDeviceEnvironments[0]};
+    char data[] = "abc";
+    auto uuid1 = drm.generateElfUUID(static_cast<const void *>(data));
+
+    EXPECT_STREQ("00000000-0000-0000-0000-000000000001", uuid1.c_str());
+}

shared/source/os_interface/linux/drm_debug.cpp

@@ -23,4 +23,24 @@ uint32_t Drm::registerIsaCookie(uint32_t isaHandle) {
 
 void Drm::unregisterResource(uint32_t handle) {
 }
+
+std::string Drm::generateUUID() {
+    const char uuidString[] = "00000000-0000-0000-%04" SCNx64 "-%012" SCNx64;
+    char buffer[36 + 1] = "00000000-0000-0000-0000-000000000000";
+    uuid++;
+
+    UNRECOVERABLE_IF(uuid == 0xFFFFFFFFFFFFFFFF);
+
+    uint64_t parts[2] = {0, 0};
+    parts[0] = uuid & 0xFFFFFFFFFFFF;
+    parts[1] = (uuid & 0xFFFF000000000000) >> 48;
+    snprintf(buffer, sizeof(buffer), uuidString, parts[1], parts[0]);
+
+    return std::string(buffer, 36);
+}
+
+std::string Drm::generateElfUUID(const void *data) {
+    return generateUUID();
+}
+
 } // namespace NEO

shared/source/os_interface/linux/drm_neo.cpp

@@ -503,21 +503,6 @@ uint32_t Drm::getVirtualMemoryAddressSpace(uint32_t vmId) {
     return 0;
 }
 
-std::string Drm::generateUUID() {
-    const char uuidString[] = "00000000-0000-0000-%04" SCNx64 "-%012" SCNx64;
-    char buffer[36 + 1] = "00000000-0000-0000-0000-000000000000";
-    uuid++;
-
-    UNRECOVERABLE_IF(uuid == 0xFFFFFFFFFFFFFFFF);
-
-    uint64_t parts[2] = {0, 0};
-    parts[0] = uuid & 0xFFFFFFFFFFFF;
-    parts[1] = (uuid & 0xFFFF000000000000) >> 48;
-    snprintf(buffer, sizeof(buffer), uuidString, parts[1], parts[0]);
-
-    return std::string(buffer, 36);
-}
-
 Drm::~Drm() {
     destroyVirtualMemoryAddressSpace();
 }

shared/source/os_interface/linux/drm_neo.h

@@ -162,6 +162,7 @@ class Drm {
   protected:
     int getQueueSliceCount(drm_i915_gem_context_param_sseu *sseu);
     std::string generateUUID();
+    std::string generateElfUUID(const void *data);
     bool sliceCountChangeSupported = false;
     drm_i915_gem_context_param_sseu sseu{};
     bool preemptionSupported = false;