Refactor per platform extra settings in ocloc

Signed-off-by: Kamil Kopryk <[email protected]>
Related-To: NEO-6382

Author: KamilKoprykIntel

level_zero/core/test/unit_tests/main.cpp

@@ -56,7 +56,7 @@ TestEnvironment *environment = nullptr;
 using namespace L0::ult;
 
 PRODUCT_FAMILY productFamily = NEO::DEFAULT_TEST_PLATFORM::hwInfo.platform.eProductFamily;
-GFXCORE_FAMILY renderCoreFamily = NEO::DEFAULT_TEST_PLATFORM::hwInfo.platform.eRenderCoreFamily;
+extern GFXCORE_FAMILY renderCoreFamily;
 int32_t revId = -1;
 uint32_t euPerSubSlice = 0;
 uint32_t sliceCount = 0;

opencl/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 
@@ -37,3 +38,8 @@ RKLTEST_F(RklHwInfoConfig, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequi
     const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily);
     EXPECT_TRUE(hwInfoConfig.is3DPipelineSelectWARequired());
 }
+
+using CompilerHwInfoConfigHelperTestsRkl = ::testing::Test;
+RKLTEST_F(CompilerHwInfoConfigHelperTestsRkl, givenRklWhenIsForceEmuInt32DivRemSPRequiredIsCalledThenReturnsTrue) {
+    EXPECT_TRUE(CompilerHwInfoConfig::get(productFamily)->isForceEmuInt32DivRemSPRequired());
+}

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

@@ -5,6 +5,7 @@
  *
  */
 
+#include "shared/source/helpers/compiler_hw_info_config.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 
 #include "test.h"
@@ -77,3 +78,8 @@ BDWTEST_F(BdwHwInfo, givenHwInfoConfigStringThenAfterSetupResultingVmeIsDisabled
     EXPECT_FALSE(hwInfo.capabilityTable.ftrSupportsVmeAvcPreemption);
     EXPECT_FALSE(hwInfo.capabilityTable.supportsVme);
 }
+
+using CompilerHwInfoConfigHelperTestsBdw = ::testing::Test;
+BDWTEST_F(CompilerHwInfoConfigHelperTestsBdw, givenBdwWhenIsStatelessToStatefulBufferOffsetSupportedIsCalledThenReturnsTrue) {
+    EXPECT_FALSE(CompilerHwInfoConfig::get(productFamily)->isStatelessToStatefulBufferOffsetSupported());
+}

opencl/test/unit_test/main.cpp

@@ -64,7 +64,7 @@ bool disabled = false;
 using namespace NEO;
 
 PRODUCT_FAMILY productFamily = DEFAULT_TEST_PLATFORM::hwInfo.platform.eProductFamily;
-GFXCORE_FAMILY renderCoreFamily = DEFAULT_TEST_PLATFORM::hwInfo.platform.eRenderCoreFamily;
+extern GFXCORE_FAMILY renderCoreFamily;
 
 extern std::string lastTest;
 bool generateRandomInput = false;

opencl/test/unit_test/offline_compiler/CMakeLists.txt

@@ -66,6 +66,7 @@ set(IGDRCL_SRCS_offline_compiler_tests
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.h
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/device_binary_format/zebin_tests.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.cpp
     ${IGDRCL_SRCS_cloc}
     ${IGDRCL_SRCS_offline_compiler_mock}
     ${NEO_CORE_tests_compiler_mocks}
@@ -90,9 +91,11 @@ link_directories(${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 add_executable(ocloc_tests ${IGDRCL_SRCS_offline_compiler_tests})
 
 target_include_directories(ocloc_tests PRIVATE
+                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
+                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
                            $<TARGET_PROPERTY:ocloc_lib,INCLUDE_DIRECTORIES>
 )
-target_compile_definitions(ocloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:ocloc_lib,INTERFACE_COMPILE_DEFINITIONS>)
+target_compile_definitions(ocloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:ocloc_lib,INTERFACE_COMPILE_DEFINITIONS> ${TESTED_GEN_FLAGS_DEFINITONS})
 
 target_link_libraries(ocloc_tests gmock-gtest)
 

opencl/test/unit_test/offline_compiler/gen12lp/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(TESTS_GEN12LP)
+  set(IGDRCL_SRCS_offline_compiler_tests_gen12lp
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  )
+  target_sources(ocloc_tests PRIVATE ${IGDRCL_SRCS_offline_compiler_tests_gen12lp})
+  add_subdirectories()
+endif()

opencl/test/unit_test/offline_compiler/gen12lp/rkl/CMakeLists.txt

@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+if(TESTS_RKL)
+  set(IGDRCL_SRCS_offline_compiler_tests_rkl
+      ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+      ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests_rkl.cpp
+  )
+  target_sources(ocloc_tests PRIVATE ${IGDRCL_SRCS_offline_compiler_tests_rkl})
+endif()

opencl/test/unit_test/offline_compiler/gen12lp/rkl/offline_compiler_tests_rkl.cpp

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/compiler_interface/compiler_options/compiler_options.h"
+
+#include "opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h"
+#include "opencl/test/unit_test/offline_compiler/offline_compiler_tests.h"
+#include "test.h"
+
+using namespace NEO;
+
+using MockOfflineCompilerRklTests = ::testing::Test;
+RKLTEST_F(MockOfflineCompilerRklTests, givenRklWhenAppendExtraInternalOptionsThenForceEmuInt32DivRemSPIsApplied) {
+
+    MockOfflineCompiler mockOfflineCompiler;
+    mockOfflineCompiler.deviceName = " rkl";
+    mockOfflineCompiler.initHardwareInfo(mockOfflineCompiler.deviceName);
+    std::string internalOptions = mockOfflineCompiler.internalOptions;
+    mockOfflineCompiler.appendExtraInternalOptions(mockOfflineCompiler.hwInfo, internalOptions);
+    size_t found = internalOptions.find(NEO::CompilerOptions::forceEmuInt32DivRemSP.data());
+    EXPECT_NE(std::string::npos, found);
+}

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

@@ -7,8 +7,9 @@
 if(TESTS_GEN8)
   set(IGDRCL_SRCS_offline_compiler_tests_gen8
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests_gen8.cpp
   )
   target_sources(ocloc_tests PRIVATE ${IGDRCL_SRCS_offline_compiler_tests_gen8})
+
   add_subdirectories()
+
 endif()

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

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