ULT: setup productFamily and renderCoreFamily before using them

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

Author: JablonskiMateusz

level_zero/core/test/unit_tests/main.cpp

@@ -185,6 +185,9 @@ int main(int argc, char **argv) {
             useDefaultListener = true;
         }
     }
+    productFamily = hwInfoForTests.platform.eProductFamily;
+    renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
+
     // Platforms with uninitialized factory are not supported
     if (L0::commandListFactory[productFamily] == nullptr) {
         std::cout << "unsupported product family has been set: " << NEO::hardwarePrefix[::productFamily] << std::endl;
@@ -227,9 +230,6 @@ int main(int argc, char **argv) {
     // set Gt and FeatureTable to initial state
     NEO::hardwareInfoSetup[productFamily](&hwInfoForTests, false, hwInfoConfig);
 
-    productFamily = hwInfoForTests.platform.eProductFamily;
-    renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
-
     NEO::defaultHwInfo = std::make_unique<NEO::HardwareInfo>();
     *NEO::defaultHwInfo = hwInfoForTests;
 

level_zero/tools/test/unit_tests/main.cpp

@@ -160,6 +160,9 @@ int main(int argc, char **argv) {
             useDefaultListener = true;
         }
     }
+    productFamily = hwInfoForTests.platform.eProductFamily;
+    renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
+
     // Platforms with uninitialized factory are not supported
     if (L0::commandListFactory[productFamily] == nullptr) {
         std::cout << "unsupported product family has been set: " << NEO::hardwarePrefix[::productFamily] << std::endl;
@@ -192,9 +195,6 @@ int main(int argc, char **argv) {
     // set Gt and FeatureTable to initial state
     NEO::hardwareInfoSetup[productFamily](&hwInfoForTests, false, hwInfoConfig);
 
-    productFamily = hwInfoForTests.platform.eProductFamily;
-    renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
-
     NEO::defaultHwInfo = std::make_unique<NEO::HardwareInfo>();
     *NEO::defaultHwInfo = hwInfoForTests;