[LLVM Pulldown] LLVM version bump (#1066)

Author: Garra1980

build_tools/llvm_version.txt

@@ -1 +1 @@
-e24c9e7a0c61ed49e79433d405cb5157483ce691
+bc1198719e206b2b6928ac437cb59107b45662d6

include/imex/Utils/XeCommon.h

@@ -26,7 +26,6 @@
 #include <mlir/IR/BuiltinOps.h>
 #include <mlir/IR/Value.h>
 #include <mlir/Transforms/DialectConversion.h>
-#include <mlir/Transforms/OneToNTypeConversion.h>
 
 using namespace mlir::xegpu;
 

lib/Conversion/ArithToVC/ArithToVC.cpp

@@ -156,7 +156,6 @@ struct ArithToVCPass : public imex::impl::ConvertArithToVCBase<ArithToVCPass> {
       return builder.create<mlir::vector::ShapeCastOp>(loc, type,
                                                        inputs.front());
     };
-    typeConverter.addArgumentMaterialization(materializeCast);
     typeConverter.addSourceMaterialization(materializeCast);
     typeConverter.addTargetMaterialization(materializeCast);
 

lib/Conversion/MathToVC/MathToVC.cpp

@@ -315,7 +315,6 @@ struct MathToVCPass : public imex::impl::ConvertMathToVCBase<MathToVCPass> {
       return builder.create<mlir::vector::ShapeCastOp>(loc, type,
                                                        inputs.front());
     };
-    typeConverter.addArgumentMaterialization(materializeCast);
     typeConverter.addSourceMaterialization(materializeCast);
     typeConverter.addTargetMaterialization(materializeCast);
 

lib/Conversion/XeGPUToVC/XeGPUToVC.cpp

@@ -743,7 +743,6 @@ struct XeGPUToVCPass : public imex::impl::ConvertXeGPUToVCBase<XeGPUToVCPass> {
 
       return nullptr;
     };
-    typeConverter.addArgumentMaterialization(materializeCast);
     typeConverter.addSourceMaterialization(materializeCast);
     typeConverter.addTargetMaterialization(materializeCast);
 

lib/Conversion/XeTileToXeGPU/XeTileToXeGPU.cpp

@@ -648,9 +648,7 @@ class MMAOpPattern : public OpConversionPattern<xetile::TileMMAOp> {
   matchAndRewrite(xetile::TileMMAOp op, OpAdaptor adaptor,
                   ConversionPatternRewriter &rewriter) const override {
     rewriter.replaceOpWithNewOp<xegpu::DpasOp>(op, op.getType(), adaptor.getA(),
-                                               adaptor.getB(), adaptor.getC(),
-                                               /*SGMapA, SGMapB, SGMapC*/
-                                               nullptr, nullptr, nullptr);
+                                               adaptor.getB(), adaptor.getC());
     return success();
   }
 };
@@ -1061,7 +1059,6 @@ struct ConvertXeTileToXeGPUPass // convert XeTile to XeGPU
           .getResult(0);
     };
 
-    typeConverter.addArgumentMaterialization(materializeWithCast);
     typeConverter.addTargetMaterialization(materializeWithCast);
     typeConverter.addSourceMaterialization(materializeWithCast);
 

lib/Conversion/XeVMToLLVM/XeVMToLLVM.cpp

@@ -150,7 +150,7 @@ static LLVM::CallOp createDeviceFunctionCall(
   Location loc = UnknownLoc::get(ctx);
 
   auto funcOpRes =
-      LLVM::lookupOrCreateFn(moduleOp, funcName, argTypes, retType);
+      LLVM::lookupOrCreateFn(rewriter, moduleOp, funcName, argTypes, retType);
   assert(!failed(funcOpRes));
   LLVM::LLVMFuncOp funcOp = funcOpRes.value();
   funcOp.setCConv(LLVM::cconv::CConv::SPIR_FUNC);

lib/Dialect/XeTile/Transforms/Canonicalization.cpp

@@ -475,7 +475,6 @@ struct XeTileCanonicalizationPass final
         return tileTy;
       });
 
-      typeConverter.addArgumentMaterialization(addUnrealizedCast);
       typeConverter.addSourceMaterialization(addUnrealizedCast);
       typeConverter.addTargetMaterialization(addUnrealizedCast);
 

lib/Dialect/XeTile/Transforms/WgToSg.cpp

@@ -13,7 +13,6 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Transforms/OneToNTypeConversion.h"
 #include <mlir/Conversion/LLVMCommon/TypeConverter.h>
 #include <mlir/Dialect/Arith/IR/Arith.h>
 #include <mlir/Dialect/Func/IR/FuncOps.h>

lib/Target/LLVM/XeVM/Target.cpp

@@ -22,6 +22,7 @@
 #include "mlir/Target/LLVMIR/Dialect/GPU/GPUToLLVMIRTranslation.h"
 #include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h"
 
+#include "llvm/Config/Targets.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/TargetSelect.h"
@@ -234,6 +235,11 @@ XeVMTargetAttrImpl::serializeToObject(Attribute attribute, Operation *module,
       *module, cast<imex::xevm::XeVMTargetAttr>(attribute), options);
   serializer.init();
 
+#if !LLVM_HAS_SPIRV_TARGET
+  module->emitError("Cannot run `TargetRegistry::lookupTarget()` for SPIRV "
+                    "without having the target built.");
+#endif
+
   return serializer.run();
 }