Don't use DEFAULT_PLATFORM in unit tests

testing for default supported platform may be disabled

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

Author: JablonskiMateusz

opencl/test/unit_test/command_stream/get_devices_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -11,6 +11,7 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/libult/create_command_stream.h"
@@ -228,14 +229,14 @@ HWTEST_F(PrepareDeviceEnvironmentsTest, givenPrepareDeviceEnvironmentsAndUnknown
                 }
                 EXPECT_TRUE(i < IGFX_MAX_PRODUCT);
                 ASSERT_NE(nullptr, hardwarePrefix[i]);
-                HardwareInfo defaultHwInfo = DEFAULT_PLATFORM::hwInfo;
-                defaultHwInfo.featureTable = {};
-                defaultHwInfo.workaroundTable = {};
-                defaultHwInfo.gtSystemInfo = {};
-                hardwareInfoSetup[defaultHwInfo.platform.eProductFamily](&defaultHwInfo, true, 0x0);
-                HwInfoConfig *hwConfig = HwInfoConfig::get(defaultHwInfo.platform.eProductFamily);
-                hwConfig->configureHardwareCustom(&defaultHwInfo, nullptr);
-                EXPECT_EQ(0, memcmp(&defaultHwInfo.platform, &hwInfo->platform, sizeof(PLATFORM)));
+                HardwareInfo baseHwInfo = *defaultHwInfo;
+                baseHwInfo.featureTable = {};
+                baseHwInfo.workaroundTable = {};
+                baseHwInfo.gtSystemInfo = {};
+                hardwareInfoSetup[baseHwInfo.platform.eProductFamily](&baseHwInfo, true, 0x0);
+                HwInfoConfig *hwConfig = HwInfoConfig::get(baseHwInfo.platform.eProductFamily);
+                hwConfig->configureHardwareCustom(&baseHwInfo, nullptr);
+                EXPECT_EQ(0, memcmp(&baseHwInfo.platform, &hwInfo->platform, sizeof(PLATFORM)));
                 break;
             }
             default:

opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp

@@ -644,19 +644,19 @@ TEST_F(OfflineCompilerTests, givenVariousClStdValuesWhenCompilingSourceThenCorre
         mockOfflineCompiler->initialize(argv.size(), argv);
 
         std::string internalOptions = mockOfflineCompiler->internalOptions;
-        std::string oclVersionOption = getOclVersionCompilerInternalOption(DEFAULT_PLATFORM::hwInfo.capabilityTable.clVersionSupport);
+        std::string oclVersionOption = getOclVersionCompilerInternalOption(mockOfflineCompiler->hwInfo.capabilityTable.clVersionSupport);
         EXPECT_THAT(internalOptions, ::testing::HasSubstr(oclVersionOption));
 
         if (clStdOptionValue == "-cl-std=CL2.0") {
             auto expectedRegex = std::string{"cl_khr_3d_image_writes"};
-            if (DEFAULT_PLATFORM::hwInfo.capabilityTable.supportsImages) {
+            if (mockOfflineCompiler->hwInfo.capabilityTable.supportsImages) {
                 expectedRegex += ".+" + std::string{"cl_khr_3d_image_writes"};
             }
             EXPECT_THAT(internalOptions, ::testing::ContainsRegex(expectedRegex));
         }
 
         OpenClCFeaturesContainer openclCFeatures;
-        getOpenclCFeaturesList(DEFAULT_PLATFORM::hwInfo, openclCFeatures);
+        getOpenclCFeaturesList(mockOfflineCompiler->hwInfo, openclCFeatures);
         for (auto &feature : openclCFeatures) {
             if (clStdOptionValue == "-cl-std=CL3.0") {
                 EXPECT_THAT(internalOptions, ::testing::HasSubstr(std::string{feature.name}));
@@ -665,7 +665,7 @@ TEST_F(OfflineCompilerTests, givenVariousClStdValuesWhenCompilingSourceThenCorre
             }
         }
 
-        if (DEFAULT_PLATFORM::hwInfo.capabilityTable.supportsImages) {
+        if (mockOfflineCompiler->hwInfo.capabilityTable.supportsImages) {
             EXPECT_THAT(internalOptions, ::testing::HasSubstr(CompilerOptions::enableImageSupport.data()));
         } else {
             EXPECT_THAT(internalOptions, ::testing::Not(::testing::HasSubstr(CompilerOptions::enableImageSupport.data())));
@@ -1244,7 +1244,7 @@ TEST(OfflineCompilerTest, WhenGeneratingElfBinaryThenBinaryIsCreated) {
     memset(&binHeader, 0, sizeof(binHeader));
     binHeader.Magic = iOpenCL::MAGIC_CL;
     binHeader.Version = iOpenCL::CURRENT_ICBE_VERSION - 3;
-    binHeader.Device = DEFAULT_PLATFORM::hwInfo.platform.eRenderCoreFamily;
+    binHeader.Device = mockOfflineCompiler->hwInfo.platform.eRenderCoreFamily;
     binHeader.GPUPointerSizeInBytes = 8;
     binHeader.NumberOfKernels = 0;
     binHeader.SteppingId = 0;
@@ -1984,7 +1984,7 @@ TEST(OclocCompile, givenDeviceAndInternalOptionsOptionWhenCompilingToSpirvThenIn
     ASSERT_EQ(0, retVal);
     retVal = ocloc.build();
     EXPECT_EQ(0, retVal);
-    std::string regexToMatch = "\\-ocl\\-version=" + std::to_string(DEFAULT_PLATFORM::hwInfo.capabilityTable.clVersionSupport) +
+    std::string regexToMatch = "\\-ocl\\-version=" + std::to_string(ocloc.hwInfo.capabilityTable.clVersionSupport) +
                                "0  \\-cl\\-ext=\\-all.* \\-cl\\-ext=\\+custom_param";
     EXPECT_THAT(ocloc.internalOptions, ::testing::ContainsRegex(regexToMatch));
 }

shared/source/dll/get_devices.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -52,5 +52,7 @@ bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment) {
 bool prepareDeviceEnvironment(ExecutionEnvironment &executionEnvironment, std::string &osPciPath, const uint32_t rootDeviceIndex) {
     return prepareDeviceEnvironments(executionEnvironment, osPciPath, rootDeviceIndex);
 }
-
+const HardwareInfo *getDefaultHwInfo() {
+    return &DEFAULT_PLATFORM::hwInfo;
+}
 } // namespace NEO

shared/source/os_interface/device_factory.cpp

@@ -30,7 +30,7 @@ bool DeviceFactory::prepareDeviceEnvironmentsForProductFamilyOverride(ExecutionE
     executionEnvironment.prepareRootDeviceEnvironments(numRootDevices);
 
     auto productFamily = DebugManager.flags.ProductFamilyOverride.get();
-    const HardwareInfo *hwInfoConst = &DEFAULT_PLATFORM::hwInfo;
+    const HardwareInfo *hwInfoConst = getDefaultHwInfo();
     getHwInfoForPlatformString(productFamily, hwInfoConst);
     std::string hwInfoConfigStr;
     uint64_t hwInfoConfig = 0x0;

shared/source/os_interface/device_factory.h

@@ -15,6 +15,8 @@ namespace NEO {
 
 class ExecutionEnvironment;
 class Device;
+struct HardwareInfo;
+const HardwareInfo *getDefaultHwInfo();
 bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment);
 bool prepareDeviceEnvironment(ExecutionEnvironment &executionEnvironment, std::string &osPciPath, const uint32_t rootDeviceIndex);
 class DeviceFactory {

shared/test/common/libult/create_command_stream.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -66,5 +66,8 @@ bool prepareDeviceEnvironment(ExecutionEnvironment &executionEnvironment, std::s
 
     return prepareDeviceEnvironmentImpl(executionEnvironment, osPciPath, rootDeviceIndex);
 }
+const HardwareInfo *getDefaultHwInfo() {
+    return defaultHwInfo.get();
+}
 
 } // namespace NEO