Move query compute slices and query memory regions to DrmParam enum

Related-To: NEO-6852, NEO-6999, NEO-7028
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/os_interface/linux/drm_neo.cpp

@@ -977,7 +977,8 @@ bool Drm::querySystemInfo() {
 }
 
 std::vector<uint8_t> Drm::getMemoryRegions() {
-    return this->query(ioctlHelper->getMemRegionsIoctlVal(), 0);
+    auto request = ioctlHelper->getDrmParamValue(DrmParam::QueryMemoryRegions);
+    return this->query(request, 0);
 }
 
 bool Drm::queryMemoryInfo() {
@@ -1094,8 +1095,8 @@ bool Drm::queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &topologyD
     int subSliceCount = 0;
     int euCount = 0;
 
-    const auto queryComputeSlicesIoctl = ioctlHelper->getComputeSlicesIoctlVal();
-    if (DebugManager.flags.UseNewQueryTopoIoctl.get() && this->engineInfo && hwInfo.gtSystemInfo.MultiTileArchInfo.TileCount > 0 && queryComputeSlicesIoctl != 0) {
+    auto request = ioctlHelper->getDrmParamValue(DrmParam::QueryComputeSlices);
+    if (DebugManager.flags.UseNewQueryTopoIoctl.get() && this->engineInfo && hwInfo.gtSystemInfo.MultiTileArchInfo.TileCount > 0 && request != 0) {
         bool success = true;
 
         for (uint32_t i = 0; i < hwInfo.gtSystemInfo.MultiTileArchInfo.TileCount; i++) {
@@ -1105,7 +1106,7 @@ bool Drm::queryTopology(const HardwareInfo &hwInfo, QueryTopologyData &topologyD
             uint32_t flags = classInstance->engineClass;
             flags |= (classInstance->engineInstance << 8);
 
-            auto dataQuery = this->query(queryComputeSlicesIoctl, flags);
+            auto dataQuery = this->query(request, flags);
             if (dataQuery.empty()) {
                 success = false;
                 break;

shared/source/os_interface/linux/drm_wrappers.h

@@ -246,6 +246,8 @@ enum class DrmParam {
     EngineClassInvalidNone,
     QueryEngineInfo,
     QueryHwconfigTable,
+    QueryComputeSlices,
+    QueryMemoryRegions,
 };
 
 unsigned int getIoctlRequestValue(DrmIoctl ioctlRequest, IoctlHelper *ioctlHelper);

shared/source/os_interface/linux/ioctl_helper.h

@@ -83,8 +83,6 @@ class IoctlHelper {
     virtual bool setVmBoAdvise(Drm *drm, int32_t handle, uint32_t attribute, void *region) = 0;
     virtual bool setVmPrefetch(Drm *drm, uint64_t start, uint64_t length, uint32_t region) = 0;
     virtual uint32_t getDirectSubmissionFlag() = 0;
-    virtual int32_t getMemRegionsIoctlVal() = 0;
-    virtual uint32_t getComputeSlicesIoctlVal() = 0;
     virtual std::unique_ptr<uint8_t[]> prepareVmBindExt(const StackVec<uint32_t, 2> &bindExtHandles) = 0;
     virtual uint64_t getFlagsForVmBind(bool bindCapture, bool bindImmediate, bool bindMakeResident) = 0;
     virtual std::vector<EngineCapabilities> translateToEngineCaps(const std::vector<uint8_t> &data) = 0;
@@ -143,8 +141,6 @@ class IoctlHelperUpstream : public IoctlHelper {
     bool setVmBoAdvise(Drm *drm, int32_t handle, uint32_t attribute, void *region) override;
     bool setVmPrefetch(Drm *drm, uint64_t start, uint64_t length, uint32_t region) override;
     uint32_t getDirectSubmissionFlag() override;
-    int32_t getMemRegionsIoctlVal() override;
-    uint32_t getComputeSlicesIoctlVal() override;
     std::unique_ptr<uint8_t[]> prepareVmBindExt(const StackVec<uint32_t, 2> &bindExtHandles) override;
     uint64_t getFlagsForVmBind(bool bindCapture, bool bindImmediate, bool bindMakeResident) override;
     std::vector<EngineCapabilities> translateToEngineCaps(const std::vector<uint8_t> &data) override;
@@ -207,8 +203,6 @@ class IoctlHelperPrelim20 : public IoctlHelper {
     bool setVmBoAdvise(Drm *drm, int32_t handle, uint32_t attribute, void *region) override;
     bool setVmPrefetch(Drm *drm, uint64_t start, uint64_t length, uint32_t region) override;
     uint32_t getDirectSubmissionFlag() override;
-    int32_t getMemRegionsIoctlVal() override;
-    uint32_t getComputeSlicesIoctlVal() override;
     std::unique_ptr<uint8_t[]> prepareVmBindExt(const StackVec<uint32_t, 2> &bindExtHandles) override;
     uint64_t getFlagsForVmBind(bool bindCapture, bool bindImmediate, bool bindMakeResident) override;
     std::vector<EngineCapabilities> translateToEngineCaps(const std::vector<uint8_t> &data) override;

shared/source/os_interface/linux/ioctl_helper_prelim.cpp

@@ -223,14 +223,6 @@ uint32_t IoctlHelperPrelim20::getDirectSubmissionFlag() {
     return PRELIM_I915_CONTEXT_CREATE_FLAGS_LONG_RUNNING;
 }
 
-int32_t IoctlHelperPrelim20::getMemRegionsIoctlVal() {
-    return PRELIM_DRM_I915_QUERY_MEMORY_REGIONS;
-}
-
-uint32_t IoctlHelperPrelim20::getComputeSlicesIoctlVal() {
-    return PRELIM_DRM_I915_QUERY_COMPUTE_SLICES;
-}
-
 uint16_t IoctlHelperPrelim20::getWaitUserFenceSoftFlag() {
     return PRELIM_I915_UFENCE_WAIT_SOFT;
 };
@@ -589,6 +581,10 @@ int IoctlHelperPrelim20::getDrmParamValue(DrmParam drmParam) const {
         return PRELIM_DRM_I915_QUERY_ENGINE_INFO;
     case DrmParam::QueryHwconfigTable:
         return PRELIM_DRM_I915_QUERY_HWCONFIG_TABLE;
+    case DrmParam::QueryComputeSlices:
+        return PRELIM_DRM_I915_QUERY_COMPUTE_SLICES;
+    case DrmParam::QueryMemoryRegions:
+        return PRELIM_DRM_I915_QUERY_MEMORY_REGIONS;
     default:
         return getDrmParamValueBase(drmParam);
     }

shared/source/os_interface/linux/ioctl_helper_upstream.cpp

@@ -107,14 +107,6 @@ uint32_t IoctlHelperUpstream::getDirectSubmissionFlag() {
     return 0u;
 }
 
-int32_t IoctlHelperUpstream::getMemRegionsIoctlVal() {
-    return DRM_I915_QUERY_MEMORY_REGIONS;
-}
-
-uint32_t IoctlHelperUpstream::getComputeSlicesIoctlVal() {
-    return 0;
-}
-
 std::unique_ptr<uint8_t[]> IoctlHelperUpstream::prepareVmBindExt(const StackVec<uint32_t, 2> &bindExtHandles) {
     return {};
 }
@@ -249,6 +241,10 @@ int IoctlHelperUpstream::getDrmParamValue(DrmParam drmParam) const {
         return DRM_I915_QUERY_ENGINE_INFO;
     case DrmParam::QueryHwconfigTable:
         return DRM_I915_QUERY_HWCONFIG_TABLE;
+    case DrmParam::QueryMemoryRegions:
+        return DRM_I915_QUERY_MEMORY_REGIONS;
+    case DrmParam::QueryComputeSlices:
+        return 0;
     default:
         return getDrmParamValueBase(drmParam);
     }

shared/test/unit_test/os_interface/linux/ioctl_helper_tests_prelim.cpp

@@ -66,6 +66,8 @@ TEST_F(IoctlPrelimHelperTests, whenGettingDrmParamValueThenPropertValueIsReturne
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), static_cast<int>(PRELIM_I915_ENGINE_CLASS_COMPUTE));
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryEngineInfo), static_cast<int>(PRELIM_DRM_I915_QUERY_ENGINE_INFO));
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryHwconfigTable), static_cast<int>(PRELIM_DRM_I915_QUERY_HWCONFIG_TABLE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryMemoryRegions), static_cast<int>(PRELIM_DRM_I915_QUERY_MEMORY_REGIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryComputeSlices), static_cast<int>(PRELIM_DRM_I915_QUERY_COMPUTE_SLICES));
 }
 
 TEST_F(IoctlPrelimHelperTests, givenIoctlParamWhenParseToStringThenProperStringIsReturned) {
@@ -188,10 +190,6 @@ TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenGetDirectSubmissionFlagThenCorrec
     EXPECT_EQ(PRELIM_I915_CONTEXT_CREATE_FLAGS_LONG_RUNNING, ioctlHelper.getDirectSubmissionFlag());
 }
 
-TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenGetMemRegionsIoctlValThenCorrectValueReturned) {
-    EXPECT_EQ(PRELIM_DRM_I915_QUERY_MEMORY_REGIONS, ioctlHelper.getMemRegionsIoctlVal());
-}
-
 TEST_F(IoctlPrelimHelperTests, givenPrelimsWhenTranslateToEngineCapsThenReturnSameData) {
     std::vector<EngineCapabilities> expectedEngines(2);
     expectedEngines[0] = {{static_cast<uint16_t>(ioctlHelper.getDrmParamValue(DrmParam::EngineClassRender)), 0}, 0};

shared/test/unit_test/os_interface/linux/ioctl_helper_tests_upstream.cpp

@@ -63,6 +63,8 @@ TEST(IoctlHelperUpstreamTest, whenGettingDrmParamValueThenPropertValueIsReturned
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::EngineClassCompute), 4);
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryEngineInfo), static_cast<int>(DRM_I915_QUERY_ENGINE_INFO));
     EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryHwconfigTable), static_cast<int>(DRM_I915_QUERY_HWCONFIG_TABLE));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryMemoryRegions), static_cast<int>(DRM_I915_QUERY_MEMORY_REGIONS));
+    EXPECT_EQ(ioctlHelper.getDrmParamValue(DrmParam::QueryComputeSlices), 0);
 }
 
 TEST(IoctlHelperUpstreamTest, whenCreatingVmControlRegionExtThenNullptrIsReturned) {
@@ -224,14 +226,6 @@ TEST(IoctlHelperTestsUpstream, givenUpstreamWhenDirectSubmissionEnabledThenNoFla
     EXPECT_EQ(0u, drm->receivedContextCreateFlags);
 }
 
-TEST(IoctlHelperTestsUpstream, givenUpstreamWhenGetMemRegionsIoctlValThenCorrectValueReturned) {
-    auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
-    executionEnvironment->prepareRootDeviceEnvironments(1);
-    auto drm = std::make_unique<DrmTipMock>(*executionEnvironment->rootDeviceEnvironments[0]);
-
-    EXPECT_EQ(DRM_I915_QUERY_MEMORY_REGIONS, drm->getIoctlHelper()->getMemRegionsIoctlVal());
-}
-
 TEST(IoctlHelperTestsUpstream, givenUpstreamWhenQueryDistancesThenReturnEinval) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
     executionEnvironment->prepareRootDeviceEnvironments(1);