WIP: Upgrade to LLVM 21

README.md

@@ -78,10 +78,10 @@ cargo add melior
 
 ### Dependencies
 
-[LLVM/MLIR 20](https://llvm.org/) needs to be installed on your system. On Linux and macOS, you can install it via [Homebrew](https://brew.sh).
+[LLVM/MLIR 21](https://llvm.org/) needs to be installed on your system. On Linux and macOS, you can install it via [Homebrew](https://brew.sh).
 
 ```sh
-brew install llvm@20
+brew install llvm@21
 ```
 
 ## Documentation

macro/Cargo.toml

@@ -20,7 +20,7 @@ quote = "1"
 regex = "1.11.1"
 syn = { version = "2", features = ["full"] }
 tblgen = { version = "0.6.0", features = [
-  "llvm20-0",
+  "llvm21-0",
 ], default-features = false }
 unindent = "0.2.4"
 

macro/build.rs

@@ -1,6 +1,6 @@
 use std::{env, error::Error, path::Path, process::Command, str};
 
-const LLVM_MAJOR_VERSION: usize = 20;
+const LLVM_MAJOR_VERSION: usize = 21;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let version_variable = format!("MLIR_SYS_{LLVM_MAJOR_VERSION}0_PREFIX");

melior/src/pass/conversion.rs

@@ -4,77 +4,76 @@ melior_macro::conversion_passes!(
     mlirCreateConversionArithToAMDGPUConversionPass,
     mlirCreateConversionArithToArmSMEConversionPass,
     mlirCreateConversionArithToLLVMConversionPass,
-    mlirCreateConversionConvertAMDGPUToROCDL,
-    mlirCreateConversionConvertAffineForToGPU,
-    mlirCreateConversionConvertAffineToStandard,
+    mlirCreateConversionConvertAffineForToGPUPass,
+    mlirCreateConversionConvertAMDGPUToROCDLPass,
     mlirCreateConversionConvertArithToEmitC,
-    mlirCreateConversionConvertArithToSPIRV,
-    mlirCreateConversionConvertArmNeon2dToIntr,
+    mlirCreateConversionConvertArithToSPIRVPass,
+    mlirCreateConversionConvertArmNeon2dToIntrPass,
     mlirCreateConversionConvertArmSMEToLLVM,
-    mlirCreateConversionConvertArmSMEToSCF,
+    mlirCreateConversionConvertArmSMEToSCFPass,
     mlirCreateConversionConvertAsyncToLLVMPass,
-    mlirCreateConversionConvertBufferizationToMemRef,
-    mlirCreateConversionConvertComplexToLLVMPass,
+    mlirCreateConversionConvertBufferizationToMemRefPass,
     mlirCreateConversionConvertComplexToLibm,
+    mlirCreateConversionConvertComplexToLLVMPass,
     mlirCreateConversionConvertComplexToSPIRVPass,
-    mlirCreateConversionConvertComplexToStandard,
+    mlirCreateConversionConvertComplexToStandardPass,
     mlirCreateConversionConvertControlFlowToLLVMPass,
-    mlirCreateConversionConvertControlFlowToSPIRV,
+    mlirCreateConversionConvertControlFlowToSPIRVPass,
     mlirCreateConversionConvertFuncToEmitC,
     mlirCreateConversionConvertFuncToLLVMPass,
-    mlirCreateConversionConvertFuncToSPIRV,
-    mlirCreateConversionConvertGPUToSPIRV,
+    mlirCreateConversionConvertFuncToSPIRVPass,
     mlirCreateConversionConvertGpuOpsToLLVMSPVOps,
     mlirCreateConversionConvertGpuOpsToNVVMOps,
     mlirCreateConversionConvertGpuOpsToROCDLOps,
+    mlirCreateConversionConvertGPUToSPIRV,
     mlirCreateConversionConvertIndexToLLVMPass,
     mlirCreateConversionConvertIndexToSPIRVPass,
-    mlirCreateConversionConvertLinalgToStandard,
+    mlirCreateConversionConvertLinalgToStandardPass,
     mlirCreateConversionConvertMathToEmitC,
     mlirCreateConversionConvertMathToFuncs,
+    mlirCreateConversionConvertMathToLibmPass,
     mlirCreateConversionConvertMathToLLVMPass,
-    mlirCreateConversionConvertMathToLibm,
     mlirCreateConversionConvertMathToROCDL,
-    mlirCreateConversionConvertMathToSPIRV,
+    mlirCreateConversionConvertMathToSPIRVPass,
     mlirCreateConversionConvertMemRefToEmitC,
-    mlirCreateConversionConvertMemRefToSPIRV,
+    mlirCreateConversionConvertMemRefToSPIRVPass,
     mlirCreateConversionConvertMeshToMPIPass,
     mlirCreateConversionConvertNVGPUToNVVMPass,
     mlirCreateConversionConvertNVVMToLLVMPass,
-    mlirCreateConversionConvertOpenACCToSCF,
+    mlirCreateConversionConvertOpenACCToSCFPass,
     mlirCreateConversionConvertOpenMPToLLVMPass,
-    mlirCreateConversionConvertPDLToPDLInterp,
-    mlirCreateConversionConvertParallelLoopToGpu,
+    mlirCreateConversionConvertParallelLoopToGpuPass,
+    mlirCreateConversionConvertPDLToPDLInterpPass,
     mlirCreateConversionConvertSCFToOpenMPPass,
+    mlirCreateConversionConvertShapeConstraintsPass,
+    mlirCreateConversionConvertShapeToStandardPass,
     mlirCreateConversionConvertSPIRVToLLVMPass,
-    mlirCreateConversionConvertShapeConstraints,
-    mlirCreateConversionConvertShapeToStandard,
-    mlirCreateConversionConvertTensorToLinalg,
-    mlirCreateConversionConvertTensorToSPIRV,
+    mlirCreateConversionConvertTensorToLinalgPass,
+    mlirCreateConversionConvertTensorToSPIRVPass,
     mlirCreateConversionConvertToLLVMPass,
-    mlirCreateConversionConvertToSPIRVPass,
-    mlirCreateConversionConvertVectorToArmSME,
+    mlirCreateConversionConvertVectorToArmSMEPass,
     mlirCreateConversionConvertVectorToGPU,
     mlirCreateConversionConvertVectorToLLVMPass,
     mlirCreateConversionConvertVectorToSCF,
-    mlirCreateConversionConvertVectorToSPIRV,
+    mlirCreateConversionConvertVectorToSPIRVPass,
     mlirCreateConversionConvertVectorToXeGPU,
     mlirCreateConversionFinalizeMemRefToLLVMConversionPass,
     mlirCreateConversionGpuToLLVMConversionPass,
     mlirCreateConversionLiftControlFlowToSCFPass,
+    mlirCreateConversionLowerAffinePass,
     mlirCreateConversionLowerHostCodeToLLVMPass,
     mlirCreateConversionMapMemRefStorageClass,
-    mlirCreateConversionReconcileUnrealizedCasts,
-    mlirCreateConversionSCFToControlFlow,
+    mlirCreateConversionReconcileUnrealizedCastsPass,
+    mlirCreateConversionSCFToControlFlowPass,
     mlirCreateConversionSCFToEmitC,
     mlirCreateConversionSCFToSPIRV,
     mlirCreateConversionSetLLVMModuleDataLayoutPass,
-    mlirCreateConversionTosaToArith,
+    mlirCreateConversionTosaToArithPass,
     mlirCreateConversionTosaToLinalg,
     mlirCreateConversionTosaToLinalgNamed,
     mlirCreateConversionTosaToMLProgram,
-    mlirCreateConversionTosaToSCF,
-    mlirCreateConversionTosaToTensor,
+    mlirCreateConversionTosaToSCFPass,
+    mlirCreateConversionTosaToTensorPass,
     mlirCreateConversionUBToLLVMConversionPass,
     mlirCreateConversionUBToSPIRVConversionPass,
 );

tools/setup.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-llvm_version=20
+llvm_version=21
 
 brew install llvm@$llvm_version