CapabilityTable adjustments part 2

- Move Windows HardwareInfo configuration from DeviceFactory to HwInfoConfig
- Add ULTs for HwInfoConfig on Windows

Change-Id: I9b84bbe60ca9f2ad4ddc3119bc8cb88331a7d154

unit_tests/os_interface/windows/CMakeLists.txt

@@ -25,6 +25,8 @@ set(IGDRCL_SRCS_tests_os_interface_windows
   ${CMAKE_CURRENT_SOURCE_DIR}/device_os_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_gdi_interface.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_kmdaf_listener.h
   ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_win.h

unit_tests/os_interface/windows/hw_info_config_tests.cpp

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2018, Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "hw_info_config_tests.h"
+
+#include "runtime/os_interface/windows/os_interface.h"
+#include "runtime/os_interface/windows/wddm.h"
+
+#include "unit_tests/helpers/debug_manager_state_restore.h"
+#include "unit_tests/libult/mock_gfx_family.h"
+
+namespace OCLRT {
+
+template <>
+int HwInfoConfigHw<IGFX_UNKNOWN>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
+    return 0;
+}
+
+void HwInfoConfigTestWindows::SetUp() {
+    HwInfoConfigTest::SetUp();
+
+    osInterface = std::make_unique<OSInterface>();
+    Wddm::enumAdapters(0, outHwInfo);
+}
+
+void HwInfoConfigTestWindows::TearDown() {
+    ReleaseOutHwInfoStructs();
+
+    HwInfoConfigTest::TearDown();
+}
+
+TEST_F(HwInfoConfigTestWindows, givenCorrectParametersWhenConfiguringHwInfoThenReturnSuccess) {
+    int ret = hwConfig.configureHwInfo(pInHwInfo, &outHwInfo, osInterface.get());
+    EXPECT_EQ(0, ret);
+}
+
+TEST_F(HwInfoConfigTestWindows, givenCorrectParametersWhenConfiguringHwInfoThenSetFtrSvmCorrectly) {
+    auto ftrSvm = outHwInfo.pSkuTable->ftrSVM;
+
+    int ret = hwConfig.configureHwInfo(pInHwInfo, &outHwInfo, osInterface.get());
+    ASSERT_EQ(0, ret);
+
+    EXPECT_EQ(outHwInfo.capabilityTable.ftrSvm, ftrSvm);
+}
+
+TEST_F(HwInfoConfigTestWindows, givenInstrumentationForHardwareIsEnabledOrDisabledWhenConfiguringHwInfoThenOverrideItUsingHaveInstrumentation) {
+    int ret;
+
+    outHwInfo.capabilityTable.instrumentationEnabled = false;
+    ret = hwConfig.configureHwInfo(pInHwInfo, &outHwInfo, osInterface.get());
+    ASSERT_EQ(0, ret);
+    EXPECT_FALSE(outHwInfo.capabilityTable.instrumentationEnabled);
+
+    outHwInfo.capabilityTable.instrumentationEnabled = true;
+    ret = hwConfig.configureHwInfo(pInHwInfo, &outHwInfo, osInterface.get());
+    ASSERT_EQ(0, ret);
+    EXPECT_TRUE(outHwInfo.capabilityTable.instrumentationEnabled == haveInstrumentation);
+}
+
+} // namespace OCLRT

unit_tests/os_interface/windows/hw_info_config_tests.h

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018, Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#pragma once
+
+#include "runtime/os_interface/hw_info_config.h"
+
+#include "unit_tests/os_interface/hw_info_config_tests.h"
+
+#include <memory>
+
+namespace OCLRT {
+
+struct DummyHwConfig : HwInfoConfigHw<IGFX_UNKNOWN> {
+};
+
+struct HwInfoConfigTestWindows : public HwInfoConfigTest {
+    void SetUp() override;
+    void TearDown() override;
+
+    std::unique_ptr<OSInterface> osInterface;
+    DummyHwConfig hwConfig;
+};
+
+} // namespace OCLRT