From 1bff5a7bcb9902aec6de21aa7be20768f0878952 Mon Sep 17 00:00:00 2001
From: "Koska, Andrzej" <andrzej.koska@intel.com>
Date: Thu, 18 Jul 2019 16:46:35 +0200
Subject: [PATCH] Dynamically expose VME extensions

Change-Id: Ia562361aeea70020cd99f813ea325fa88ca37006
Signed-off-by: Koska, Andrzej <andrzej.koska@intel.com>
Related-To: NEO-3416
---
 offline_compiler/offline_compiler.cpp             |  3 +++
 runtime/device/device_caps.cpp                    |  2 +-
 runtime/gen11/hw_info_ehl.inl                     |  2 +-
 runtime/gen11/hw_info_lkf.inl                     |  4 ++--
 runtime/platform/extensions.cpp                   |  5 ++++-
 unit_tests/api/cl_get_device_info_tests.inl       |  1 -
 unit_tests/api/gl/cl_get_gl_device_info_tests.cpp |  1 -
 unit_tests/device/device_caps_tests.cpp           |  4 ++++
 unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp  | 10 ++++++++++
 unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp  | 10 ++++++++++
 10 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp
index 10436a1658..277358800f 100644
--- a/offline_compiler/offline_compiler.cpp
+++ b/offline_compiler/offline_compiler.cpp
@@ -540,6 +540,9 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
                 printf("Error: Cannot get HW Info for device %s.\n", deviceName.c_str());
             } else {
                 std::string extensionsList = getExtensionsList(*hwInfo);
+                std::string vme("cl_intel_device_side_avc_motion_estimation ");
+                if (extensionsList.find(vme) == std::string::npos)
+                    extensionsList += vme;
                 internalOptions.append(convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str()));
             }
         }
diff --git a/runtime/device/device_caps.cpp b/runtime/device/device_caps.cpp
index 954c9a2c36..16d71c8924 100644
--- a/runtime/device/device_caps.cpp
+++ b/runtime/device/device_caps.cpp
@@ -147,7 +147,7 @@ void Device::initializeCaps() {
         deviceInfo.packedYuvExtension = true;
     }
     if (DebugManager.flags.EnableIntelVme.get() && supportsVme) {
-        deviceExtensions += "cl_intel_motion_estimation ";
+        deviceExtensions += "cl_intel_motion_estimation cl_intel_device_side_avc_motion_estimation ";
         deviceInfo.vmeExtension = true;
     }
     if (DebugManager.flags.EnableIntelAdvancedVme.get() && supportsVme) {
diff --git a/runtime/gen11/hw_info_ehl.inl b/runtime/gen11/hw_info_ehl.inl
index 3bbb394215..494d01c601 100644
--- a/runtime/gen11/hw_info_ehl.inl
+++ b/runtime/gen11/hw_info_ehl.inl
@@ -63,7 +63,7 @@ const RuntimeCapabilityTable EHL::capabilityTable{
     true,                                          // forceStatelessCompilationFor32Bit
     "lp",                                          // platformType
     true,                                          // sourceLevelDebuggerSupported
-    true,                                          // supportsVme
+    false,                                         // supportsVme
     false,                                         // supportCacheFlushAfterWalker
     true                                           // supportsImages
 };
diff --git a/runtime/gen11/hw_info_lkf.inl b/runtime/gen11/hw_info_lkf.inl
index e2f4c76bd9..f6ca8a39d5 100644
--- a/runtime/gen11/hw_info_lkf.inl
+++ b/runtime/gen11/hw_info_lkf.inl
@@ -54,8 +54,8 @@ const RuntimeCapabilityTable LKF::capabilityTable{
     false,                                         // ftrSupports64BitMath
     false,                                         // ftrSvm
     true,                                          // ftrSupportsCoherency
-    true,                                          // ftrSupportsVmeAvcTextureSampler
-    true,                                          // ftrSupportsVmeAvcPreemption
+    false,                                         // ftrSupportsVmeAvcTextureSampler
+    false,                                         // ftrSupportsVmeAvcPreemption
     false,                                         // ftrRenderCompressedBuffers
     false,                                         // ftrRenderCompressedImages
     true,                                          // ftr64KBpages
diff --git a/runtime/platform/extensions.cpp b/runtime/platform/extensions.cpp
index e48d14c219..2dc6dfc75e 100644
--- a/runtime/platform/extensions.cpp
+++ b/runtime/platform/extensions.cpp
@@ -30,7 +30,6 @@ const char *deviceExtensionsList = "cl_khr_3d_image_writes "
                                    "cl_intel_accelerator "
                                    "cl_intel_media_block_io "
                                    "cl_intel_driver_diagnostics "
-                                   "cl_intel_device_side_avc_motion_estimation "
                                    "cl_khr_priority_hints "
                                    "cl_khr_throttle_hints "
                                    "cl_khr_create_command_queue ";
@@ -54,6 +53,10 @@ std::string getExtensionsList(const HardwareInfo &hwInfo) {
         allExtensionsList += "cl_khr_fp64 ";
     }
 
+    if (hwInfo.capabilityTable.supportsVme) {
+        allExtensionsList += "cl_intel_motion_estimation cl_intel_device_side_avc_motion_estimation ";
+    }
+
     return allExtensionsList;
 }
 
diff --git a/unit_tests/api/cl_get_device_info_tests.inl b/unit_tests/api/cl_get_device_info_tests.inl
index b50ce6d857..9beb74df51 100644
--- a/unit_tests/api/cl_get_device_info_tests.inl
+++ b/unit_tests/api/cl_get_device_info_tests.inl
@@ -178,7 +178,6 @@ TEST_F(clGetDeviceInfoTests, GivenClDeviceExtensionsParamWhenGettingDeviceInfoTh
         "cl_intel_accelerator ",
         "cl_intel_media_block_io ",
         "cl_intel_driver_diagnostics ",
-        "cl_intel_device_side_avc_motion_estimation ",
     };
 
     for (auto element = 0u; element < sizeof(supportedExtensions) / sizeof(supportedExtensions[0]); element++) {
diff --git a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp
index ee59a66482..e265be8ffe 100644
--- a/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp
+++ b/unit_tests/api/gl/cl_get_gl_device_info_tests.cpp
@@ -64,7 +64,6 @@ TEST_P(GetDeviceGlInfoStr, StringType) {
             "cl_intel_accelerator",
             "cl_intel_media_block_io",
             "cl_intel_driver_diagnostics",
-            "cl_intel_device_side_avc_motion_estimation",
             "cl_khr_gl_depth_images",
             "cl_khr_gl_event",
             "cl_khr_gl_msaa_sharing",
diff --git a/unit_tests/device/device_caps_tests.cpp b/unit_tests/device/device_caps_tests.cpp
index be9e2e76ee..4ebe0980db 100644
--- a/unit_tests/device/device_caps_tests.cpp
+++ b/unit_tests/device/device_caps_tests.cpp
@@ -470,6 +470,7 @@ TEST(Device_GetCaps, givenEnableVmeSetToTrueAndDeviceSupportsVmeWhenCapsAreCreat
     const auto &caps = device->getDeviceInfo();
 
     EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_motion_estimation")));
+    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_device_side_avc_motion_estimation")));
     EXPECT_TRUE(caps.vmeExtension);
 
     EXPECT_THAT(caps.builtInKernels, testing::HasSubstr("block_motion_estimate_intel"));
@@ -484,6 +485,7 @@ TEST(Device_GetCaps, givenEnableVmeSetToTrueAndDeviceDoesNotSupportVmeWhenCapsAr
     const auto &caps = device->getDeviceInfo();
 
     EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_motion_estimation"))));
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_device_side_avc_motion_estimation"))));
     EXPECT_FALSE(caps.vmeExtension);
 
     EXPECT_THAT(caps.builtInKernels, testing::Not(testing::HasSubstr("block_motion_estimate_intel")));
@@ -498,6 +500,7 @@ TEST(Device_GetCaps, givenEnableVmeSetToFalseAndDeviceDoesNotSupportVmeWhenCapsA
     const auto &caps = device->getDeviceInfo();
 
     EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_motion_estimation"))));
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_device_side_avc_motion_estimation"))));
     EXPECT_FALSE(caps.vmeExtension);
 
     EXPECT_THAT(caps.builtInKernels, testing::Not(testing::HasSubstr("block_motion_estimate_intel")));
@@ -512,6 +515,7 @@ TEST(Device_GetCaps, givenEnableVmeSetToFalseAndDeviceSupportsVmeWhenCapsAreCrea
     const auto &caps = device->getDeviceInfo();
 
     EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_motion_estimation"))));
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_device_side_avc_motion_estimation"))));
     EXPECT_FALSE(caps.vmeExtension);
 
     EXPECT_THAT(caps.builtInKernels, testing::Not(testing::HasSubstr("block_motion_estimate_intel")));
diff --git a/unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp b/unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp
index 6b705e0986..bb7af15fb9 100644
--- a/unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp
+++ b/unit_tests/gen11/ehl/test_hw_info_config_ehl.cpp
@@ -53,6 +53,16 @@ TEST(EhlHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorr
 
 using EhlHwInfo = ::testing::Test;
 
+EHLTEST_F(EhlHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) {
+    HardwareInfo hwInfo;
+
+    std::string strConfig = "1x4x8";
+    hardwareInfoSetup[productFamily](&hwInfo, false, strConfig);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption);
+    EXPECT_FALSE(hwInfo.capabilityTable.supportsVme);
+}
+
 EHLTEST_F(EhlHwInfo, givenBoolWhenCallEhlHardwareInfoSetupThenFeatureTableAndWorkaroundTableAreSetCorrect) {
     bool boolValue[]{
         true, false};
diff --git a/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp b/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp
index 5d4be9ba56..1e99f01059 100644
--- a/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp
+++ b/unit_tests/gen11/lkf/test_hw_info_config_lkf.cpp
@@ -39,6 +39,16 @@ TEST(LkfHwInfoConfig, givenHwInfoConfigStringThenAfterSetupResultingHwInfoIsCorr
 
 using LkfHwInfo = ::testing::Test;
 
+LKFTEST_F(LkfHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled) {
+    HardwareInfo hwInfo;
+
+    std::string strConfig = "1x8x8";
+    hardwareInfoSetup[productFamily](&hwInfo, false, strConfig);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcTextureSampler);
+    EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption);
+    EXPECT_FALSE(hwInfo.capabilityTable.supportsVme);
+}
+
 LKFTEST_F(LkfHwInfo, givenBoolWhenCallLkfHardwareInfoSetupThenFeatureTableAndWorkaroundTableAreSetCorrect) {
     bool boolValue[]{
         true, false};