Restore VC build for Interim mode

Restore VC build for Interim mode and possibility to patch
vc-intrinsics llvmWrapper

Author: matborzyszkowski

IGC/CMakeLists.txt

@@ -424,8 +424,6 @@ endif()
 if(IGC_BUILD_LLVM_INTERIM)
   message(STATUS "[IGC] IGC_BUILD_LLVM_INTERIM = ${IGC_BUILD_LLVM_INTERIM}")
   add_compile_definitions(IGC_LLVM_TRUNK_REVISION)
-  # Temporary disable VC for Interim
-  set(IGC_BUILD__VC_ENABLED OFF)
 endif()
 
 # Enable vector compiler for Linux and Windows
@@ -437,6 +435,11 @@ if(NOT DEFINED IGC_BUILD__VC_ENABLED)
 endif()
 
 
+if(IGC_BUILD_LLVM_INTERIM AND IGC_BUILD__VC_ENABLED)
+  # Add vc-intrinsics patcher for Interim mode
+  include("${IGC_SOURCE_DIR}/../external/vc-intrinsics/CMakeLists.txt")
+endif()
+
 # ======================================== Path helper variables =======================================
 
 set(IGC_BUILD__IGC_SRC_DIR          "${IGC_SOURCE_DIR}")

external/vc-intrinsics/CMakeLists.txt

@@ -0,0 +1,35 @@
+#=========================== begin_copyright_notice ============================
+#
+# Copyright (C) 2024 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+#============================ end_copyright_notice =============================
+
+# This code is responsible for applying patches to vc-intrinsics LLVM Wrapper.
+
+cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
+
+set(IGC_VC_INTRINSICS_PATCHES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../external/vc-intrinsics/patches")
+set(IGC_VC_INTRINSICS_SOURCE_DIR "${BS_DIR_EXTERNAL_COMPONENTS}/cmc/vc-intrinsics")
+
+message(STATUS "[VC-INTRINSICS PATCHER] Applying patches from ${IGC_VC_INTRINSICS_PATCHES_DIR}")
+
+file(GLOB IGC_VC_INTRINSICS_PATCHES "${IGC_VC_INTRINSICS_PATCHES_DIR}/*.patch")
+
+find_program(GIT NAMES git git.cmd)
+
+if(NOT GIT)
+    message(FATAL_ERROR "[VC-INTRINSICS PATCHER] Git not found")
+endif()
+
+foreach(PATCH_FILE ${IGC_VC_INTRINSICS_PATCHES})
+    message(STATUS "[VC-INTRINSICS PATCHER] Applying patch ${PATCH_FILE} to ${IGC_VC_INTRINSICS_SOURCE_DIR}")
+    execute_process(
+        COMMAND ${GIT} apply --unsafe-paths --directory=${IGC_VC_INTRINSICS_SOURCE_DIR} ${PATCH_FILE}
+        RESULT_VARIABLE PATCH_RESULT
+    )
+    if(NOT PATCH_RESULT EQUAL 0)
+        message(FATAL_ERROR "[VC-INTRINSICS PATCHER] Failed to apply patch ${PATCH_FILE} to ${IGC_VC_INTRINSICS_SOURCE_DIR}")
+    endif()
+endforeach()

external/vc-intrinsics/patches/instruction_simplify.patch

@@ -0,0 +1,39 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2024 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+diff --git a/GenXIntrinsics/include/llvmVCWrapper/Analysis/InstructionSimplify.h b/GenXIntrinsics/include/llvmVCWrapper/Analysis/InstructionSimplify.h
+index d6eaf74..2573f32 100644
+--- a/GenXIntrinsics/include/llvmVCWrapper/Analysis/InstructionSimplify.h
++++ b/GenXIntrinsics/include/llvmVCWrapper/Analysis/InstructionSimplify.h
+@@ -26,7 +26,7 @@ inline llvm::Value *SimplifyInsertElementInst(llvm::Value *Vec,
+                                               llvm::Value *Elt,
+                                               llvm::Value *Idx,
+                                               const llvm::SimplifyQuery &Q) {
+-#if VC_INTR_LLVM_VERSION_MAJOR <= 14
++#if (VC_INTR_LLVM_VERSION_MAJOR <= 14) || defined (IGC_LLVM_TRUNK_REVISION)
+   return llvm::SimplifyInsertElementInst(Vec, Elt, Idx, Q);
+ #else
+   return llvm::simplifyInsertElementInst(Vec, Elt, Idx, Q);
+@@ -36,7 +36,7 @@ inline llvm::Value *SimplifyInsertElementInst(llvm::Value *Vec,
+ inline llvm::Value *SimplifyExtractElementInst(llvm::Value *Vec,
+                                                llvm::Value *Idx,
+                                                const llvm::SimplifyQuery &Q) {
+-#if VC_INTR_LLVM_VERSION_MAJOR <= 14
++#if (VC_INTR_LLVM_VERSION_MAJOR <= 14) || defined (IGC_LLVM_TRUNK_REVISION)
+   return llvm::SimplifyExtractElementInst(Vec, Idx, Q);
+ #else
+   return llvm::simplifyExtractElementInst(Vec, Idx, Q);
+@@ -46,7 +46,7 @@ inline llvm::Value *SimplifyExtractElementInst(llvm::Value *Vec,
+ inline llvm::Value *SimplifyCastInst(unsigned CastOpc, llvm::Value *Op,
+                                      llvm::Type *Ty,
+                                      const llvm::SimplifyQuery &Q) {
+-#if VC_INTR_LLVM_VERSION_MAJOR <= 14
++#if (VC_INTR_LLVM_VERSION_MAJOR <= 14) || defined (IGC_LLVM_TRUNK_REVISION)
+   return llvm::SimplifyCastInst(CastOpc, Op, Ty, Q);
+ #else
+   return llvm::simplifyCastInst(CastOpc, Op, Ty, Q);

external/vc-intrinsics/patches/instructions.patch

@@ -0,0 +1,30 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2024 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+diff --git a/GenXIntrinsics/include/llvmVCWrapper/IR/Instructions.h b/GenXIntrinsics/include/llvmVCWrapper/IR/Instructions.h
+index 074efe0..bc188bb 100644
+--- a/GenXIntrinsics/include/llvmVCWrapper/IR/Instructions.h
++++ b/GenXIntrinsics/include/llvmVCWrapper/IR/Instructions.h
+@@ -54,7 +54,7 @@ inline llvm::ArrayRef<int> getShuffleMask(llvm::ArrayRef<int> Mask,
+ 
+ template <class ArgKind>
+ inline ArgKind &getValue(VCINTR::Optional<ArgKind> &opt) {
+-#if VC_INTR_LLVM_VERSION_MAJOR < 15
++#if (VC_INTR_LLVM_VERSION_MAJOR < 15) || defined (IGC_LLVM_TRUNK_REVISION)
+   return opt.getValue();
+ #else
+   return opt.value();
+@@ -63,7 +63,7 @@ inline ArgKind &getValue(VCINTR::Optional<ArgKind> &opt) {
+ 
+ template <class ArgKind>
+ inline const ArgKind &getValue(const VCINTR::Optional<ArgKind> &opt) {
+-#if VC_INTR_LLVM_VERSION_MAJOR < 15
++#if (VC_INTR_LLVM_VERSION_MAJOR < 15) || defined (IGC_LLVM_TRUNK_REVISION)
+   return opt.getValue();
+ #else
+   return opt.value();