Move API agnotic gen8 tests to shared

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

opencl/test/unit_test/fixtures/media_kernel_fixture.h

@@ -6,10 +6,11 @@
  */
 
 #pragma once
+#include "shared/test/common/helpers/default_hw_info.h"
+
 #include "opencl/test/unit_test/command_queue/enqueue_fixture.h"
 #include "opencl/test/unit_test/fixtures/hello_world_fixture.h"
 #include "opencl/test/unit_test/helpers/cl_hw_parse.h"
-#include "opencl/test/unit_test/mocks/mock_platform.h"
 
 namespace NEO {
 
@@ -57,7 +58,7 @@ struct MediaKernelFixture : public HelloWorldFixture<FactoryType>,
     }
 
     void SetUp() override {
-        skipVmeTest = !platform()->peekExecutionEnvironment()->rootDeviceEnvironments[0]->getHardwareInfo()->capabilityTable.supportsVme;
+        skipVmeTest = !defaultHwInfo->capabilityTable.supportsVme;
         if (skipVmeTest) {
             GTEST_SKIP();
         }

opencl/test/unit_test/gen8/CMakeLists.txt

@@ -7,17 +7,14 @@
 if(TESTS_GEN8)
   set(IGDRCL_SRCS_tests_gen8
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen8.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen8.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen8.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen8.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen8.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/test_cl_device_caps_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_preemption_gen8.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen8.cpp
   )
 
   get_property(NEO_CORE_TESTS_GEN8 GLOBAL PROPERTY NEO_CORE_TESTS_GEN8)

opencl/test/unit_test/gen8/bdw/CMakeLists.txt

@@ -1,16 +1,10 @@
 #
-# Copyright (C) 2018-2020 Intel Corporation
+# Copyright (C) 2018-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(TESTS_BDW)
-  set(IGDRCL_SRCS_tests_gen8_bdw
-      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_bdw.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_bdw.cpp
-  )
-  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_bdw})
   add_subdirectories()
   neo_copy_test_files_with_revision(copy_test_files_bdw_0 bdw 0)
   add_dependencies(copy_test_files_per_product copy_test_files_bdw_0)

opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/test_macros/test.h"
+
+#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+
+using namespace NEO;
+using ClHwHelperTestGen8 = ::testing::Test;
+
+GEN8TEST_F(ClHwHelperTestGen8, WhenGettingDeviceIpVersionThenMakeCorrectDeviceIpVersion) {
+    EXPECT_EQ(ClHwHelperMock::makeDeviceIpVersion(8, 0, 0), ClHwHelper::get(renderCoreFamily).getDeviceIpVersion(*defaultHwInfo));
+}
+
+GEN8TEST_F(ClHwHelperTestGen8, WhenGettingSupportedDeviceFeatureCapabilitiesThenReturnCorrectValue) {
+    EXPECT_EQ(0u, ClHwHelper::get(renderCoreFamily).getSupportedDeviceFeatureCapabilities());
+}

opencl/test/unit_test/gen8/bdw/windows/CMakeLists.txt

@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/test_macros/test.h"
+
+#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
+
+using namespace NEO;
+
+using Gen8ClDeviceCaps = Test<ClDeviceFixture>;
+
+GEN8TEST_F(Gen8ClDeviceCaps, WhenCheckingExtensionStringThenFp64IsSupported) {
+    const auto &caps = pClDevice->getDeviceInfo();
+    std::string extensionString = caps.deviceExtensions;
+
+    EXPECT_NE(std::string::npos, extensionString.find(std::string("cl_khr_fp64")));
+    EXPECT_NE(0u, caps.doubleFpConfig);
+}
+
+GEN8TEST_F(Gen8ClDeviceCaps, WhenGettingDeviceInfoThenCorrectlyRoundedDivideSqrtIsEnabled) {
+    const auto &caps = pClDevice->getDeviceInfo();
+    EXPECT_NE(0u, caps.singleFpConfig & CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT);
+}
+
+GEN8TEST_F(Gen8ClDeviceCaps, givenGen8WhenCheckExtensionsThenDeviceProperlyReportsClKhrSubgroupsExtension) {
+    const auto &caps = pClDevice->getDeviceInfo();
+    if (pClDevice->areOcl21FeaturesEnabled()) {
+        EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_subgroups")));
+    } else {
+        EXPECT_THAT(caps.deviceExtensions, ::testing::Not(testing::HasSubstr(std::string("cl_khr_subgroups"))));
+    }
+}
+
+GEN8TEST_F(Gen8ClDeviceCaps, givenGen8WhenCheckingCapsThenDeviceDoesProperlyReportsIndependentForwardProgress) {
+    const auto &caps = pClDevice->getDeviceInfo();
+
+    if (pClDevice->areOcl21FeaturesEnabled()) {
+        EXPECT_TRUE(caps.independentForwardProgress != 0);
+    } else {
+        EXPECT_FALSE(caps.independentForwardProgress != 0);
+    }
+}
+
+GEN8TEST_F(Gen8ClDeviceCaps, WhenCheckingImage3dDimensionsThenCapsAreSetCorrectly) {
+    const auto &caps = pClDevice->getDeviceInfo();
+    EXPECT_EQ(2048u, caps.image3DMaxWidth);
+    EXPECT_EQ(2048u, caps.image3DMaxHeight);
+}

opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp

@@ -11,17 +11,9 @@
 
 using namespace NEO;
 
-struct Gen8PlatformCaps : public PlatformFixture, public ::testing::Test {
-    void SetUp() override {
-        PlatformFixture::SetUp();
-    }
+using Gen8PlatformCaps = Test<PlatformFixture>;
 
-    void TearDown() override {
-        PlatformFixture::TearDown();
-    }
-};
-
-BDWTEST_F(Gen8PlatformCaps, WhenCheckingExtensionStringThenFp64IsSupported) {
+GEN8TEST_F(Gen8PlatformCaps, WhenCheckingExtensionStringThenFp64IsSupported) {
     const auto &caps = pPlatform->getPlatformInfo();
 
     EXPECT_NE(std::string::npos, caps.extensions.find(std::string("cl_khr_fp64")));

opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp

@@ -5,5 +5,13 @@
 #
 
 if(TESTS_GEN8)
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/coherency_tests_gen8.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_gen8.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen8.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen8.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen8.cpp
+  )
   add_subdirectories()
 endif()

opencl/test/unit_test/gen8/test_cl_device_caps_gen8.cpp

@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(TESTS_BDW)
+  target_sources(neo_shared_tests PRIVATE
+                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_bdw.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_bdw.cpp
+  )
+  add_subdirectories()
+endif()

opencl/test/unit_test/gen8/test_platform_caps_gen8.cpp

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018-2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/test_macros/test.h"
+
+using namespace NEO;
+using BdwUsDeviceIdTest = ::testing::Test;
+
+BDWTEST_F(BdwUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
+    unsigned short bdwSimulationIds[6] = {
+        0x0BD0,
+        0x0BD1,
+        0x0BD2,
+        0x0BD3,
+        0x0BD4,
+        0, // default, non-simulation
+    };
+
+    for (auto &id : bdwSimulationIds) {
+        auto hardwareInfo = *defaultHwInfo;
+        hardwareInfo.platform.usDeviceID = id;
+        std::unique_ptr<MockDevice> mockDevice(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hardwareInfo, 0u /*rootDeviceIndex*/));
+        ASSERT_NE(mockDevice.get(), nullptr);
+
+        if (id == 0)
+            EXPECT_FALSE(mockDevice->isSimulation());
+        else
+            EXPECT_TRUE(mockDevice->isSimulation());
+    }
+}

opencl/test/unit_test/gen8/windows/CMakeLists.txt

@@ -9,17 +9,15 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
+#include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "opencl/source/platform/platform.h"
-#include "opencl/test/unit_test/mocks/mock_platform.h"
-
 using namespace NEO;
 
-typedef ::testing::Test Gen8CoherencyRequirements;
+using Gen8CoherencyRequirements = ::testing::Test;
 
 GEN8TEST_F(Gen8CoherencyRequirements, WhenMemoryManagerIsInitializedThenNoCoherencyProgramming) {
-    ExecutionEnvironment *executionEnvironment = platform()->peekExecutionEnvironment();
+    auto executionEnvironment = std::make_unique<MockExecutionEnvironment>();
     executionEnvironment->initializeMemoryManager();
     CommandStreamReceiverHw<BDWFamily> csr(*executionEnvironment, 0, 1);
     LinearStream stream;