Update spirv-llvm-translator.conf

Signed-off-by: Whitney Tsang <[email protected]>

Author: whitneywhtsang

third_party/intel/cmake/3388.patch

@@ -1,8 +1,8 @@
 diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
-index d363f060a..28f83d661 100644
+index ec4ec41f5..4f6d80dd1 100644
 --- a/lib/SPIRV/SPIRVWriter.cpp
 +++ b/lib/SPIRV/SPIRVWriter.cpp
-@@ -4211,20 +4211,6 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
+@@ -4276,20 +4276,6 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
    // -spirv-allow-unknown-intrinsics work correctly.
    auto IID = II->getIntrinsicID();
    switch (IID) {
@@ -23,7 +23,7 @@ index d363f060a..28f83d661 100644
    case Intrinsic::assume: {
      // llvm.assume translation is currently supported only within
      // SPV_KHR_expect_assume extension, ignore it otherwise, since it's
-@@ -5508,11 +5494,6 @@ SPIRVValue *LLVMToSPIRVBase::transDirectCallInst(CallInst *CI,
+@@ -5721,11 +5707,6 @@ SPIRVValue *LLVMToSPIRVBase::transDirectCallInst(CallInst *CI,
    SmallVector<std::string, 2> Dec;
    if (isBuiltinTransToExtInst(CI->getCalledFunction(), &ExtSetKind, &ExtOp,
                                &Dec)) {
@@ -36,10 +36,10 @@ index d363f060a..28f83d661 100644
        auto *FormatStrPtr = cast<PointerType>(CI->getArgOperand(0)->getType());
        if (FormatStrPtr->getAddressSpace() !=
 diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.cpp b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
-index a680574ec..2ff1df097 100644
+index b76987e93..8d06ee792 100644
 --- a/lib/SPIRV/libSPIRV/SPIRVModule.cpp
 +++ b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
-@@ -1732,8 +1732,6 @@ SPIRVInstruction *SPIRVModuleImpl::addBinaryInst(Op TheOpCode, SPIRVType *Type,
+@@ -1739,8 +1739,6 @@ SPIRVInstruction *SPIRVModuleImpl::addBinaryInst(Op TheOpCode, SPIRVType *Type,
                                                   SPIRVValue *Op1,
                                                   SPIRVValue *Op2,
                                                   SPIRVBasicBlock *BB) {
@@ -48,10 +48,10 @@ index a680574ec..2ff1df097 100644
    return addInstruction(SPIRVInstTemplateBase::create(
                              TheOpCode, Type, getId(),
                              getVec(Op1->getId(), Op2->getId()), BB, this),
-@@ -1757,8 +1755,6 @@ SPIRVInstruction *SPIRVModuleImpl::addUnaryInst(Op TheOpCode,
-                                                 SPIRVType *TheType,
-                                                 SPIRVValue *Op,
-                                                 SPIRVBasicBlock *BB) {
+@@ -1764,8 +1762,6 @@ SPIRVInstruction *
+ SPIRVModuleImpl::addUnaryInst(Op TheOpCode, SPIRVType *TheType, SPIRVValue *Op,
+                               SPIRVBasicBlock *BB,
+                               SPIRVInstruction *InsertBefore) {
 -  if (TheType->isTypeFloat(16, FPEncodingBFloat16KHR) && TheOpCode != OpDot)
 -    addCapability(internal::CapabilityBFloat16ArithmeticINTEL);
    return addInstruction(

third_party/intel/cmake/FindSPIRVToLLVMTranslator.cmake

@@ -123,6 +123,28 @@ if (NOT SPIRVToLLVMTranslator_FOUND)
             if(NOT PATCH_RESULT EQUAL 0)
                 message(FATAL_ERROR "Failed to apply revert_3406.patch to SPIRV-LLVM-Translator")
             endif()
+            execute_process(
+                COMMAND git apply --check ${CMAKE_CURRENT_LIST_DIR}/revert_3407.patch
+                WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                ERROR_QUIET
+                RESULT_VARIABLE PATCH_RESULT
+            )
+            if(PATCH_RESULT EQUAL 0)
+                execute_process(
+                        COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/revert_3407.patch
+                        WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                        RESULT_VARIABLE PATCH_RESULT
+                )
+            else()
+                execute_process( # Check if the patch is already applied
+                        COMMAND git apply --reverse --check ${CMAKE_CURRENT_LIST_DIR}/revert_3407.patch
+                        WORKING_DIRECTORY ${spirv-llvm-translator_SOURCE_DIR}
+                        RESULT_VARIABLE PATCH_RESULT
+                )
+            endif()
+            if(NOT PATCH_RESULT EQUAL 0)
+                message(FATAL_ERROR "Failed to apply revert_3407.patch to SPIRV-LLVM-Translator")
+            endif()
     endif()
 
     set(SPIRVToLLVMTranslator_INCLUDE_DIR "${SPIRVToLLVMTranslator_SOURCE_DIR}/include"

third_party/intel/cmake/revert_3407.patch

@@ -1 +1 @@
-daba8b217bc266806ac00095262d1af0ba2ee610
+af594c0b45250fefa2093dfc31cb14d1eb6a32f2