Use isMidThreadPreemptionSupported helper in compiler interface

Signed-off-by: Kamil Kopryk <[email protected]>

Author: KamilKoprykIntel

opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h

@@ -31,6 +31,7 @@ class MockOfflineCompiler : public OfflineCompiler {
     using OfflineCompiler::internalOptions;
     using OfflineCompiler::irBinary;
     using OfflineCompiler::irBinarySize;
+    using OfflineCompiler::isMidThreadPreemptionSupported;
     using OfflineCompiler::isSpirV;
     using OfflineCompiler::options;
     using OfflineCompiler::outputDirectory;

opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp

@@ -1017,6 +1017,20 @@ TEST(OfflineCompilerTest, givenDefaultOfflineCompilerObjectWhenNoOptionsAreChang
     EXPECT_FALSE(mockOfflineCompiler->inputFileSpirV);
 }
 
+TEST(OfflineCompilerTest, whenIsMidThreadPreemptionSupportedIsCalledThenCorrectResultIsReturned) {
+    MockOfflineCompiler offlineCompiler;
+
+    if (!hardwarePrefix[IGFX_SKYLAKE]) {
+        GTEST_SKIP();
+    }
+    offlineCompiler.getHardwareInfo("skl");
+    offlineCompiler.hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt = false;
+    EXPECT_FALSE(offlineCompiler.isMidThreadPreemptionSupported(offlineCompiler.hwInfo));
+
+    offlineCompiler.hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt = true;
+    EXPECT_TRUE(offlineCompiler.isMidThreadPreemptionSupported(offlineCompiler.hwInfo));
+}
+
 TEST(OfflineCompilerTest, givenIntermediateRepresentationInputWhenBuildSourceCodeIsCalledThenProperTranslationContextIsUsed) {
     MockOfflineCompiler mockOfflineCompiler;
     std::vector<std::string> argv = {

opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp

@@ -320,7 +320,7 @@ HWTEST_F(HwInfoConfigTestLinuxDummy, GivenPreemptionDrmEnabledMidThreadOnWhenCon
         I915_SCHEDULER_CAP_PREEMPTION;
     drm->storedDeviceID = hwConfigTestMidThreadBit;
 
-    UnitTestHelper<FamilyType>::setExtraMidThreadPreemptionFlag(pInHwInfo);
+    UnitTestHelper<FamilyType>::setExtraMidThreadPreemptionFlag(pInHwInfo, true);
 
     int ret = hwConfig.configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
     EXPECT_EQ(0, ret);

shared/offline_compiler/source/extra_settings.cpp

@@ -16,4 +16,9 @@ void OfflineCompiler::resolveExtraSettings() {
         CompilerOptions::concatenateAppend(internalOptions, CompilerOptions::forceEmuInt32DivRemSP);
     }
 }
+
+bool OfflineCompiler::isMidThreadPreemptionSupported(const HardwareInfo &hwInfo) {
+    return hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt;
+}
+
 } // namespace NEO

shared/offline_compiler/source/offline_compiler.cpp

@@ -609,7 +609,7 @@ int OfflineCompiler::initialize(size_t numArgs, const std::vector<std::string> &
     igcFeWa.get()->SetFtrGTX(hwInfo.featureTable.ftrGTX);
     igcFeWa.get()->SetFtr5Slice(hwInfo.featureTable.ftr5Slice);
 
-    igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt);
+    igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(isMidThreadPreemptionSupported(hwInfo));
     igcFeWa.get()->SetFtrIoMmuPageFaulting(hwInfo.featureTable.ftrIoMmuPageFaulting);
     igcFeWa.get()->SetFtrWddm2Svm(hwInfo.featureTable.ftrWddm2Svm);
     igcFeWa.get()->SetFtrPooledEuEnabled(hwInfo.featureTable.ftrPooledEuEnabled);

shared/offline_compiler/source/offline_compiler.h

@@ -96,6 +96,7 @@ class OfflineCompiler {
     int parseCommandLine(size_t numArgs, const std::vector<std::string> &allArgs);
     void setStatelessToStatefullBufferOffsetFlag();
     void resolveExtraSettings();
+    bool isMidThreadPreemptionSupported(const HardwareInfo &hwInfo);
     void parseDebugSettings();
     void storeBinary(char *&pDst, size_t &dstSize, const void *pSrc, const size_t srcSize);
     MOCKABLE_VIRTUAL int buildSourceCode();

shared/source/compiler_interface/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2020 Intel Corporation
+# Copyright (C) 2019-2021 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -13,6 +13,7 @@ set(NEO_COMPILER_INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/compiler_interface.inl
     ${CMAKE_CURRENT_SOURCE_DIR}/create_main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config.h
+    ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/compiler_extra_settings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/intermediate_representations.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.h
     ${CMAKE_CURRENT_SOURCE_DIR}/linker.inl

shared/source/compiler_interface/compiler_extra_settings.cpp

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#include "shared/source/compiler_interface/compiler_interface.h"
+
+namespace NEO {
+
+bool CompilerInterface::isMidThreadPreemptionSupported(const HardwareInfo &hwInfo) {
+    return hwInfo.featureTable.ftrGpGpuMidThreadLevelPreempt;
+}
+
+} // namespace NEO

shared/source/compiler_interface/compiler_interface.cpp

@@ -452,7 +452,7 @@ IGC::IgcOclDeviceCtxTagOCL *CompilerInterface::getIgcDeviceCtx(const Device &dev
     igcFeWa.get()->SetFtrGTX(device.getHardwareInfo().featureTable.ftrGTX);
     igcFeWa.get()->SetFtr5Slice(device.getHardwareInfo().featureTable.ftr5Slice);
 
-    igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(device.getHardwareInfo().featureTable.ftrGpGpuMidThreadLevelPreempt);
+    igcFeWa.get()->SetFtrGpGpuMidThreadLevelPreempt(isMidThreadPreemptionSupported(device.getHardwareInfo()));
     igcFeWa.get()->SetFtrIoMmuPageFaulting(device.getHardwareInfo().featureTable.ftrIoMmuPageFaulting);
     igcFeWa.get()->SetFtrWddm2Svm(device.getHardwareInfo().featureTable.ftrWddm2Svm);
     igcFeWa.get()->SetFtrPooledEuEnabled(device.getHardwareInfo().featureTable.ftrPooledEuEnabled);

shared/source/compiler_interface/compiler_interface.h

@@ -183,5 +183,7 @@ class CompilerInterface {
         bool requiresIgc = (IGC::CodeType::oclC != translationSrc) || ((IGC::CodeType::spirV != translationDst) && (IGC::CodeType::llvmBc != translationDst) && (IGC::CodeType::llvmLl != translationDst));
         return (isFclAvailable() || (false == requiresFcl)) && (isIgcAvailable() || (false == requiresIgc));
     }
+
+    bool isMidThreadPreemptionSupported(const HardwareInfo &hwInfo);
 };
 } // namespace NEO