Remove Original Functions After Joint Matrix Function Resolution

In the JointMatrixFuncsResolution pass, functions with joint matrix arguments were resolved into new functions; however, the original functions were not deleted. This commit addresses the issue by ensuring that the original functions, once resolved, are properly removed.

Author: YixingZhang007

IGC/Compiler/Optimizer/OpenCLPasses/JointMatrixFuncsResolutionPass/JointMatrixFuncsResolutionPass.cpp

@@ -226,6 +226,14 @@ bool JointMatrixFuncsResolutionPass::runOnModule(Module &M)
         Changed |= runOnFunction(F);
     }
 
+    for (const auto& ResolvedFunctionPair : ResolvedFuncSignatures) {
+        Function *OriginalFunction = ResolvedFunctionPair.first;
+
+        if (OriginalFunction->use_empty()) {
+            OriginalFunction->eraseFromParent();
+        }
+    }
+
     return Changed;
 }
 

IGC/Compiler/tests/JointMatrixFuncsResolutionPass/ErrorsReporting/validate-org-func-removed-typed-pointers.ll

@@ -0,0 +1,25 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2024 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+;
+; RUN: igc_opt -igc-joint-matrix-resolution --platformpvc -S 2>&1 < %s | FileCheck %s
+; ------------------------------------------------
+; JointMatrixFuncsResolutionPass - Verify whether the original function is removed
+;                                  after resolving function with joint matrix arguments
+;                                  into new function.
+; ------------------------------------------------
+
+; CHECK-NOT: define internal spir_func void @test
+; CHECK: define internal spir_func void @test_resolved
+
+%"struct.sycl::_V1::ext::oneapi::experimental::matrix::joint_matrix" = type { %spirv.JointMatrixINTEL._float_8_16_3_3_2 addrspace(1)* }
+%spirv.JointMatrixINTEL._float_8_16_3_3_2 = type opaque
+
+;Function Attrs: nounwind
+define internal spir_func void @test(%"struct.sycl::_V1::ext::oneapi::experimental::matrix::joint_matrix" addrspace(4)* nocapture align 8 dereferenceable(8) %m){
+  ret void
+}

IGC/Compiler/tests/JointMatrixFuncsResolutionPass/ErrorsReporting/validate-org-func-removed.ll

@@ -0,0 +1,26 @@
+;=========================== begin_copyright_notice ============================
+;
+; Copyright (C) 2024 Intel Corporation
+;
+; SPDX-License-Identifier: MIT
+;
+;============================ end_copyright_notice =============================
+;
+; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; RUN: igc_opt -igc-joint-matrix-resolution --platformpvc -S 2>&1 < %s | FileCheck %s
+; ------------------------------------------------
+; JointMatrixFuncsResolutionPass - Verify whether the original function is removed
+;                                  after resolving function with joint matrix arguments
+;                                  into new function.
+; ------------------------------------------------
+
+; CHECK-NOT: define internal spir_func void @test
+; CHECK: define internal spir_func void @test_resolved
+
+%"struct.sycl::_V1::ext::oneapi::experimental::matrix::joint_matrix" = type { %spirv.JointMatrixINTEL._float_8_16_3_3_2 addrspace(1)* }
+%spirv.JointMatrixINTEL._float_8_16_3_3_2 = type opaque
+
+;Function Attrs: nounwind
+define internal spir_func void @test(%"struct.sycl::_V1::ext::oneapi::experimental::matrix::joint_matrix" addrspace(4)* nocapture align 8 dereferenceable(8) %m){
+  ret void
+}