Update spirv-llvm-translator.conf (#5312)

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

Author: whitneywhtsang

third_party/intel/cmake/3388.patch

@@ -0,0 +1,59 @@
+diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
+index d363f060a..28f83d661 100644
+--- a/lib/SPIRV/SPIRVWriter.cpp
++++ b/lib/SPIRV/SPIRVWriter.cpp
+@@ -4211,20 +4211,6 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
+   // -spirv-allow-unknown-intrinsics work correctly.
+   auto IID = II->getIntrinsicID();
+   switch (IID) {
+-  case Intrinsic::fabs:
+-  case Intrinsic::fma:
+-  case Intrinsic::maxnum:
+-  case Intrinsic::minnum:
+-  case Intrinsic::fmuladd: {
+-    Type *Ty = II->getType();
+-    if (Ty->isBFloatTy())
+-      BM->addCapability(internal::CapabilityBFloat16ArithmeticINTEL);
+-    break;
+-  }
+-  default:
+-    break;
+-  }
+-  switch (IID) {
+   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,
+   SmallVector<std::string, 2> Dec;
+   if (isBuiltinTransToExtInst(CI->getCalledFunction(), &ExtSetKind, &ExtOp,
+                               &Dec)) {
+-    if (const auto *FirstArg = F->getArg(0)) {
+-      const auto *Type = FirstArg->getType();
+-      if (Type->isBFloatTy())
+-        BM->addCapability(internal::CapabilityBFloat16ArithmeticINTEL);
+-    }
+     if (DemangledName.find("__spirv_ocl_printf") != StringRef::npos) {
+       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
+--- a/lib/SPIRV/libSPIRV/SPIRVModule.cpp
++++ b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
+@@ -1732,8 +1732,6 @@ SPIRVInstruction *SPIRVModuleImpl::addBinaryInst(Op TheOpCode, SPIRVType *Type,
+                                                  SPIRVValue *Op1,
+                                                  SPIRVValue *Op2,
+                                                  SPIRVBasicBlock *BB) {
+-  if (Type->isTypeFloat(16, FPEncodingBFloat16KHR) && TheOpCode != OpDot)
+-    addCapability(internal::CapabilityBFloat16ArithmeticINTEL);
+   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) {
+-  if (TheType->isTypeFloat(16, FPEncodingBFloat16KHR) && TheOpCode != OpDot)
+-    addCapability(internal::CapabilityBFloat16ArithmeticINTEL);
+   return addInstruction(
+       SPIRVInstTemplateBase::create(TheOpCode, TheType, getId(),
+                                     getVec(Op->getId()), BB, this),

third_party/intel/cmake/FindSPIRVToLLVMTranslator.cmake

@@ -49,6 +49,30 @@ if (NOT SPIRVToLLVMTranslator_FOUND)
             if(NOT PATCH_RESULT EQUAL 0)
                 message(FATAL_ERROR "Failed to apply 3122.patch to SPIRV-LLVM-Translator")
             endif()
+
+            # FIXME: Don't apply patch when Agama driver is updated to incorporate with the SPV_INTEL_bfloat16_arithmetic extension.
+            execute_process(
+                COMMAND git apply --check ${CMAKE_CURRENT_LIST_DIR}/3388.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}/3388.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}/3388.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 3388.patch to SPIRV-LLVM-Translator")
+            endif()
     endif()
 
     set(SPIRVToLLVMTranslator_INCLUDE_DIR "${SPIRVToLLVMTranslator_SOURCE_DIR}/include"

third_party/intel/lib/Target/SPIRV/spirv-llvm-translator.conf

@@ -1 +1 @@
-8e8c02c4b803062501a6bd36aecdbb041fa1daef
+b12cb1c7371fc53cd0a6880795caec4f81a8eed0