Update LLVM to 17 (#330)

Close #329.

README.md

@@ -68,10 +68,10 @@ cargo add melior
 
 ### Dependencies
 
-[LLVM/MLIR 16](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 17](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@16
+brew install llvm@17
 ```
 
 ## Documentation

macro/Cargo.toml

@@ -20,7 +20,7 @@ proc-macro2 = "1"
 quote = "1"
 regex = "1.9.5"
 syn = { version = "2", features = ["full"] }
-tblgen = { version = "0.3.0", features = ["llvm16-0"] }
+tblgen = { version = "0.3.0", features = ["llvm17-0"], default-features = false }
 unindent = "0.2.3"
 
 [dev-dependencies]

macro/src/dialect.rs

@@ -16,7 +16,7 @@ use quote::quote;
 use std::{env, fmt::Display, path::Path, process::Command, str};
 use tblgen::{record::Record, record_keeper::RecordKeeper, TableGenParser};
 
-const LLVM_MAJOR_VERSION: usize = 16;
+const LLVM_MAJOR_VERSION: usize = 17;
 
 pub fn generate_dialect(input: DialectInput) -> Result<TokenStream, Box<dyn std::error::Error>> {
     let mut td_parser = TableGenParser::new();

macro/src/lib.rs

@@ -84,7 +84,8 @@ pub fn conversion_passes(stream: TokenStream) -> TokenStream {
     convert_result(pass::generate(identifiers.identifiers(), |mut name| {
         name = name.strip_prefix("Conversion").unwrap();
         name = name.strip_prefix("Convert").unwrap_or(name);
-        name.strip_suffix("ConversionPass").unwrap_or(name).into()
+        name = name.strip_suffix("ConversionPass").unwrap_or(name);
+        name.strip_suffix("Pass").unwrap_or(name).into()
     }))
 }
 

melior/src/dialect/llvm.rs

@@ -253,10 +253,10 @@ mod tests {
             .add_pass(pass::conversion::create_arith_to_llvm());
         pass_manager
             .nested_under("func.func")
-            .add_pass(pass::conversion::create_index_to_llvm_pass());
+            .add_pass(pass::conversion::create_index_to_llvm());
         pass_manager.add_pass(pass::conversion::create_scf_to_control_flow());
         pass_manager.add_pass(pass::conversion::create_control_flow_to_llvm());
-        pass_manager.add_pass(pass::conversion::create_mem_ref_to_llvm());
+        pass_manager.add_pass(pass::conversion::create_finalize_mem_ref_to_llvm());
 
         assert_eq!(pass_manager.run(module), Ok(()));
         assert!(module.as_operation().verify());

melior/src/dialect/ods.rs

@@ -13,7 +13,7 @@ melior_macro::dialect! {
 }
 melior_macro::dialect! {
     name: "amdgpu",
-    tablegen: r#"include "mlir/Dialect/AMDGPU/AMDGPU.td""#
+    tablegen: r#"include "mlir/Dialect/AMDGPU/IR/AMDGPU.td""#
 }
 melior_macro::dialect! {
     name: "arith",

melior/src/dialect/snapshots/melior__dialect__llvm__tests__compile_poison.snap

@@ -4,7 +4,7 @@ expression: module.as_operation()
 ---
 module attributes {llvm.data_layout = ""} {
   llvm.func @foo(%arg0: !llvm.struct<(i64)>) {
-    %0 = "llvm.mlir.poison"() : () -> !llvm.struct<(i64)>
+    %0 = llvm.mlir.poison : !llvm.struct<(i64)>
     llvm.return
   }
 }

melior/src/pass/conversion.rs

@@ -7,48 +7,47 @@ melior_macro::conversion_passes!(
     mlirCreateConversionConvertAMDGPUToROCDL,
     mlirCreateConversionConvertArithToSPIRV,
     mlirCreateConversionConvertArmNeon2dToIntr,
-    mlirCreateConversionConvertAsyncToLLVM,
+    mlirCreateConversionConvertAsyncToLLVMPass,
     mlirCreateConversionConvertBufferizationToMemRef,
     mlirCreateConversionConvertComplexToLibm,
-    mlirCreateConversionConvertComplexToLLVM,
+    mlirCreateConversionConvertComplexToLLVMPass,
     mlirCreateConversionConvertComplexToStandard,
-    mlirCreateConversionConvertControlFlowToLLVM,
+    mlirCreateConversionConvertControlFlowToLLVMPass,
     mlirCreateConversionConvertControlFlowToSPIRV,
-    mlirCreateConversionConvertFuncToLLVM,
+    mlirCreateConversionConvertFuncToLLVMPass,
     mlirCreateConversionConvertFuncToSPIRV,
     mlirCreateConversionConvertGpuLaunchFuncToVulkanLaunchFunc,
     mlirCreateConversionConvertGpuOpsToNVVMOps,
     mlirCreateConversionConvertGpuOpsToROCDLOps,
     mlirCreateConversionConvertGPUToSPIRV,
     mlirCreateConversionConvertIndexToLLVMPass,
-    mlirCreateConversionConvertLinalgToLLVM,
+    mlirCreateConversionConvertLinalgToLLVMPass,
     mlirCreateConversionConvertLinalgToStandard,
     mlirCreateConversionConvertMathToFuncs,
     mlirCreateConversionConvertMathToLibm,
-    mlirCreateConversionConvertMathToLLVM,
+    mlirCreateConversionConvertMathToLLVMPass,
     mlirCreateConversionConvertMathToSPIRV,
     mlirCreateConversionConvertMemRefToSPIRV,
-    mlirCreateConversionConvertNVGPUToNVVM,
-    mlirCreateConversionConvertOpenACCToLLVM,
+    mlirCreateConversionConvertNVGPUToNVVMPass,
     mlirCreateConversionConvertOpenACCToSCF,
-    mlirCreateConversionConvertOpenMPToLLVM,
+    mlirCreateConversionConvertOpenMPToLLVMPass,
     mlirCreateConversionConvertParallelLoopToGpu,
     mlirCreateConversionConvertPDLToPDLInterp,
-    mlirCreateConversionConvertSCFToOpenMP,
+    mlirCreateConversionConvertSCFToOpenMPPass,
     mlirCreateConversionConvertShapeConstraints,
     mlirCreateConversionConvertShapeToStandard,
-    mlirCreateConversionConvertSPIRVToLLVM,
+    mlirCreateConversionConvertSPIRVToLLVMPass,
     mlirCreateConversionConvertTensorToLinalg,
     mlirCreateConversionConvertTensorToSPIRV,
     mlirCreateConversionConvertVectorToGPU,
-    mlirCreateConversionConvertVectorToLLVM,
+    mlirCreateConversionConvertVectorToLLVMPass,
     mlirCreateConversionConvertVectorToSCF,
     mlirCreateConversionConvertVectorToSPIRV,
-    mlirCreateConversionConvertVulkanLaunchFuncToVulkanCalls,
+    mlirCreateConversionConvertVulkanLaunchFuncToVulkanCallsPass,
     mlirCreateConversionGpuToLLVMConversionPass,
-    mlirCreateConversionLowerHostCodeToLLVM,
+    mlirCreateConversionLowerHostCodeToLLVMPass,
     mlirCreateConversionMapMemRefStorageClass,
-    mlirCreateConversionMemRefToLLVMConversionPass,
+    mlirCreateConversionFinalizeMemRefToLLVMConversionPass,
     mlirCreateConversionReconcileUnrealizedCasts,
     mlirCreateConversionSCFToControlFlow,
     mlirCreateConversionSCFToSPIRV,

melior/src/pass/gpu.rs

@@ -2,7 +2,6 @@
 
 melior_macro::gpu_passes!(
     // spell-checker: disable-next-line
-    mlirCreateGPUGPULowerMemorySpaceAttributesPass,
     mlirCreateGPUGpuAsyncRegionPass,
     mlirCreateGPUGpuKernelOutlining,
     mlirCreateGPUGpuLaunchSinkIndexComputations,

melior/src/pass/manager.rs

@@ -6,7 +6,7 @@ use crate::{
 use mlir_sys::{
     mlirPassManagerAddOwnedPass, mlirPassManagerCreate, mlirPassManagerDestroy,
     mlirPassManagerEnableIRPrinting, mlirPassManagerEnableVerifier,
-    mlirPassManagerGetAsOpPassManager, mlirPassManagerGetNestedUnder, mlirPassManagerRun,
+    mlirPassManagerGetAsOpPassManager, mlirPassManagerGetNestedUnder, mlirPassManagerRunOnOp,
     MlirPassManager,
 };
 use std::marker::PhantomData;
@@ -54,8 +54,9 @@ impl<'c> PassManager<'c> {
 
     /// Runs passes added to a pass manager against a module.
     pub fn run(&self, module: &mut Module) -> Result<(), Error> {
-        let result =
-            LogicalResult::from_raw(unsafe { mlirPassManagerRun(self.raw, module.to_raw()) });
+        let result = LogicalResult::from_raw(unsafe {
+            mlirPassManagerRunOnOp(self.raw, module.as_operation().to_raw())
+        });
 
         if result.is_success() {
             Ok(())
@@ -201,7 +202,7 @@ mod tests {
 
         assert_eq!(
             manager.as_operation_pass_manager().to_string(),
-            "builtin.module(func.func(print-op-stats{json=false}))"
+            "any(func.func(print-op-stats{json=false}))"
         );
         assert_eq!(
             function_manager.to_string(),

tools/setup.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-llvm_version=16
+llvm_version=17
 
 if [ -n "$CI" ]; then
   brew install --overwrite [email protected]