Create a wrapper for drm_i915_query_item

Related-To: NEO-6852
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp

@@ -72,7 +72,7 @@ class DrmPrelimMock : public DrmMock {
         distances[3].engine = engines[3].engine;
         distances[3].region = {I915_MEMORY_CLASS_DEVICE, 3};
 
-        std::vector<drm_i915_query_item> queryItems{distances.size()};
+        std::vector<QueryItem> queryItems{distances.size()};
         for (auto i = 0u; i < distances.size(); i++) {
             queryItems[i].length = sizeof(drm_i915_query_engine_info);
         }
@@ -91,7 +91,7 @@ class DrmPrelimMock : public DrmMock {
         distances[0].engine = engines[0].engine;
         distances[0].region = {I915_MEMORY_CLASS_DEVICE, 0};
 
-        std::vector<drm_i915_query_item> queryItems{distances.size()};
+        std::vector<QueryItem> queryItems{distances.size()};
         for (auto i = 0u; i < distances.size(); i++) {
             queryItems[i].length = sizeof(drm_i915_query_engine_info);
         }

opencl/test/unit_test/linux/mock_os_layer.cpp

@@ -8,6 +8,7 @@
 #include "mock_os_layer.h"
 
 #include "shared/source/helpers/string.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 
 #include <cassert>
 #include <dirent.h>
@@ -251,15 +252,15 @@ int drmVersion(drm_version_t *version) {
 }
 
 int drmQueryItem(drm_i915_query *query) {
-    auto queryItemArg = reinterpret_cast<drm_i915_query_item *>(query->items_ptr);
+    auto queryItemArg = reinterpret_cast<NEO::QueryItem *>(query->items_ptr);
     if (queryItemArg->length == 0) {
-        if (queryItemArg->query_id == DRM_I915_QUERY_TOPOLOGY_INFO) {
+        if (queryItemArg->queryId == DRM_I915_QUERY_TOPOLOGY_INFO) {
             queryItemArg->length = sizeof(drm_i915_query_topology_info) + 1;
             return 0;
         }
     } else {
-        if (queryItemArg->query_id == DRM_I915_QUERY_TOPOLOGY_INFO) {
-            auto topologyArg = reinterpret_cast<drm_i915_query_topology_info *>(queryItemArg->data_ptr);
+        if (queryItemArg->queryId == DRM_I915_QUERY_TOPOLOGY_INFO) {
+            auto topologyArg = reinterpret_cast<drm_i915_query_topology_info *>(queryItemArg->dataPtr);
             topologyArg->max_slices = 1;
             topologyArg->max_subslices = 1;
             topologyArg->max_eus_per_subslice = 3;

shared/source/os_interface/linux/device_time_drm.cpp

@@ -12,8 +12,6 @@
 #include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "drm/i915_drm.h"
-
 #include <time.h>
 
 namespace NEO {

shared/source/os_interface/linux/drm_buffer_object.cpp

@@ -19,8 +19,6 @@
 #include "shared/source/os_interface/os_context.h"
 #include "shared/source/utilities/stackvec.h"
 
-#include "drm/i915_drm.h"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <map>

shared/source/os_interface/linux/drm_memory_manager.cpp

@@ -31,8 +31,6 @@
 #include "shared/source/os_interface/linux/os_context_linux.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "drm/i915_drm.h"
-
 #include <cstring>
 #include <iostream>
 #include <memory>

shared/source/os_interface/linux/drm_neo.cpp

@@ -24,6 +24,7 @@
 #include "shared/source/os_interface/linux/drm_gem_close_worker.h"
 #include "shared/source/os_interface/linux/drm_memory_manager.h"
 #include "shared/source/os_interface/linux/drm_memory_operations_handler_bind.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 #include "shared/source/os_interface/linux/hw_device_id.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/ioctl_strings.h"
@@ -674,8 +675,8 @@ bool Drm::isi915Version(int fileDescriptor) {
 
 std::vector<uint8_t> Drm::query(uint32_t queryId, uint32_t queryItemFlags) {
     drm_i915_query query{};
-    drm_i915_query_item queryItem{};
-    queryItem.query_id = queryId;
+    QueryItem queryItem{};
+    queryItem.queryId = queryId;
     queryItem.length = 0; // query length first
     queryItem.flags = queryItemFlags;
     query.items_ptr = reinterpret_cast<__u64>(&queryItem);
@@ -687,7 +688,7 @@ std::vector<uint8_t> Drm::query(uint32_t queryId, uint32_t queryItemFlags) {
     }
 
     auto data = std::vector<uint8_t>(queryItem.length, 0);
-    queryItem.data_ptr = castToUint64(data.data());
+    queryItem.dataPtr = castToUint64(data.data());
 
     ret = this->ioctl(DRM_IOCTL_I915_QUERY, &query);
     if (ret != 0 || queryItem.length <= 0) {
@@ -1093,14 +1094,14 @@ bool Drm::queryEngineInfo(bool isSysmanEnabled) {
         return true;
     }
 
-    std::vector<drm_i915_query_item> queryItems{distanceInfos.size()};
+    std::vector<QueryItem> queryItems{distanceInfos.size()};
     auto ret = ioctlHelper->queryDistances(this, queryItems, distanceInfos);
     if (ret != 0) {
         return false;
     }
 
     const bool queryUnsupported = std::all_of(queryItems.begin(), queryItems.end(),
-                                              [](const drm_i915_query_item &item) { return item.length == -EINVAL; });
+                                              [](const QueryItem &item) { return item.length == -EINVAL; });
     if (queryUnsupported) {
         DEBUG_BREAK_IF(tileCount != 1);
         this->engineInfo.reset(new EngineInfo(this, hwInfo, engines));

shared/source/os_interface/linux/drm_neo.h

@@ -20,6 +20,7 @@
 #include "shared/source/utilities/api_intercept.h"
 #include "shared/source/utilities/stackvec.h"
 
+#include "drm/i915_drm.h"
 #include "engine_node.h"
 #include "igfxfmid.h"
 

shared/source/os_interface/linux/drm_wrappers.cpp

@@ -45,4 +45,10 @@ static_assert(sizeof(ExecObject) == sizeof(drm_i915_gem_exec_object2));
 
 static_assert(sizeof(ExecBuffer) == sizeof(drm_i915_gem_execbuffer2));
 
+static_assert(sizeof(QueryItem) == sizeof(drm_i915_query_item));
+static_assert(offsetof(QueryItem, queryId) == offsetof(drm_i915_query_item, query_id));
+static_assert(offsetof(QueryItem, length) == offsetof(drm_i915_query_item, length));
+static_assert(offsetof(QueryItem, flags) == offsetof(drm_i915_query_item, flags));
+static_assert(offsetof(QueryItem, dataPtr) == offsetof(drm_i915_query_item, data_ptr));
+
 } // namespace NEO

shared/source/os_interface/linux/drm_wrappers.h

@@ -49,4 +49,12 @@ struct GemGetTiling {
     uint32_t swizzleMode;
     uint32_t physSwizzleMode;
 };
+
+struct QueryItem {
+    uint64_t queryId;
+    int32_t length;
+    uint32_t flags;
+    uint64_t dataPtr;
+};
+
 } // namespace NEO

shared/source/os_interface/linux/engine_info.cpp

@@ -13,6 +13,7 @@
 #include "shared/source/helpers/engine_node_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
+#include "shared/source/os_interface/linux/drm_wrappers.h"
 
 #include <array>
 
@@ -76,7 +77,7 @@ EngineInfo::EngineInfo(Drm *drm, HardwareInfo *hwInfo, const std::vector<EngineC
     setSupportedEnginesInfo(hwInfo, computeEngines, bcsInfoMask);
 }
 
-EngineInfo::EngineInfo(Drm *drm, HardwareInfo *hwInfo, uint32_t tileCount, const std::vector<DistanceInfo> &distanceInfos, const std::vector<drm_i915_query_item> &queryItems, const std::vector<EngineCapabilities> &engineInfos)
+EngineInfo::EngineInfo(Drm *drm, HardwareInfo *hwInfo, uint32_t tileCount, const std::vector<DistanceInfo> &distanceInfos, const std::vector<QueryItem> &queryItems, const std::vector<EngineCapabilities> &engineInfos)
     : engines(engineInfos), tileToEngineToInstanceMap(tileCount) {
     auto tile = 0u;
     auto computeEnginesPerTile = 0u;