fix: Use debug SIP when debugging is enabled

Disable wMTP when debug is enabled

Related-to: NEO-10085

Signed-off-by: Brandon Yates <[email protected]>

Author: bmyates

shared/source/built_ins/sip.cpp

@@ -237,20 +237,26 @@ void SipKernel::freeSipKernels(RootDeviceEnvironment *rootDeviceEnvironment, Mem
     }
 }
 
-void SipKernel::selectSipClassType(std::string &fileName, const GfxCoreHelper &gfxCoreHelper) {
+void SipKernel::selectSipClassType(std::string &fileName, Device &device) {
+    const GfxCoreHelper &gfxCoreHelper = device.getGfxCoreHelper();
     const std::string unknown("unk");
     if (fileName.compare(unknown) == 0) {
-        SipKernel::classType = gfxCoreHelper.isSipKernelAsHexadecimalArrayPreferred()
-                                   ? SipClassType::hexadecimalHeaderFile
-                                   : SipClassType::builtins;
+        bool debuggingEnabled = device.getDebugger() != nullptr;
+        if (debuggingEnabled) {
+            SipKernel::classType = SipClassType::builtins;
+        } else {
+            SipKernel::classType = gfxCoreHelper.isSipKernelAsHexadecimalArrayPreferred()
+                                       ? SipClassType::hexadecimalHeaderFile
+                                       : SipClassType::builtins;
+        }
     } else {
         SipKernel::classType = SipClassType::rawBinaryFromFile;
     }
 }
 
 bool SipKernel::initSipKernelImpl(SipKernelType type, Device &device, OsContext *context) {
     std::string fileName = debugManager.flags.LoadBinarySipFromFile.get();
-    SipKernel::selectSipClassType(fileName, device.getGfxCoreHelper());
+    SipKernel::selectSipClassType(fileName, device);
 
     switch (SipKernel::classType) {
     case SipClassType::rawBinaryFromFile:

shared/source/built_ins/sip.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -78,7 +78,7 @@ class SipKernel {
     static std::string createHeaderFilename(const std::string &filename);
 
     static bool initHexadecimalArraySipKernel(SipKernelType type, Device &device);
-    static void selectSipClassType(std::string &fileName, const GfxCoreHelper &gfxCoreHelper);
+    static void selectSipClassType(std::string &fileName, Device &device);
 
     const std::vector<char> stateSaveAreaHeader;
     const std::vector<char> binary;

shared/test/unit_test/built_ins/sip_tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -729,4 +729,21 @@ TEST(DebugBindlessSip, givenOfflineDebuggingModeWhenDebugSipForContextIsCreatedT
     EXPECT_EQ(high, patchedBinary[6]);
 
     gEnvironment->igcPopDebugVars();
+}
+class SipKernelMock : public SipKernel {
+  public:
+    using SipKernel::selectSipClassType;
+};
+
+using DebugBuiltinSipTest = Test<DeviceFixture>;
+
+TEST_F(DebugBuiltinSipTest, givenDebuggerWhenInitSipKernelThenDbgSipIsLoadedFromBuiltin) {
+    pDevice->executionEnvironment->rootDeviceEnvironments[0]->initDebuggerL0(pDevice);
+    auto sipKernelType = SipKernel::getSipKernelType(*pDevice);
+    EXPECT_TRUE(SipKernel::initSipKernel(sipKernelType, *pDevice));
+    EXPECT_LE(SipKernelType::dbgCsr, sipKernelType);
+
+    auto sipAllocation = SipKernel::getSipKernel(*pDevice, nullptr).getSipAllocation();
+    EXPECT_NE(nullptr, sipAllocation);
+    EXPECT_EQ(SipKernelMock::classType, SipClassType::builtins);
 }