Fixes for nightly (#42)

* fix operand_segment_sizes for LLVM > 15 DenseI32 * fix io conversion to void ptr * handle additional param to mlirExecutionEngineCreate * fix executionengine tests * fix version checks
JuliaLLVM · Jan 17, 2024 · 176e4f0 · 176e4f0
1 parent 67749a7
commit 176e4f0
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 13 deletions.
diff --git a/examples/brutus.jl b/examples/brutus.jl
@@ -270,7 +270,7 @@ end
 
 # ---
 
-using Test
+using Test, LLVM
 using MLIR.IR, MLIR
 
 fptr = IR.context!(IR.Context()) do
@@ -292,7 +292,11 @@ fptr = IR.context!(IR.Context()) do
 
     IR.run!(pm, mod)
 
-    jit = MLIR.API.mlirExecutionEngineCreate(mod, 0, 0, C_NULL)
+    jit = if LLVM.version() >= v"16"
+        MLIR.API.mlirExecutionEngineCreate(mod, 0, 0, C_NULL, false)
+    else
+        MLIR.API.mlirExecutionEngineCreate(mod, 0, 0, C_NULL)
+    end
     MLIR.API.mlirExecutionEngineLookup(jit, "pow")
 end
 

diff --git a/src/Dialects.jl b/src/Dialects.jl
@@ -1,7 +1,7 @@
 module Dialects
 
 import LLVM
-import ..IR: Attribute, NamedAttribute, context
+import ..IR: Attribute, NamedAttribute, DenseArrayAttribute, context
 import ..API
 
 namedattribute(name, val) = namedattribute(name, Attribute(val))
@@ -11,7 +11,13 @@ function namedattribute(name, val::NamedAttribute)
     return val
 end
 
-operandsegmentsizes(segments) = namedattribute("operand_segment_sizes", Attribute(Int32.(segments)))
+operandsegmentsizes(segments) =
+    namedattribute("operand_segment_sizes",
+        LLVM.version() >= v"16" ?
+            DenseArrayAttribute(Int32.(segments)) :
+            Attribute(Int32.(segments))
+    )
+
 
 let
     ver = string(LLVM.version().major)

diff --git a/src/IR/IR.jl b/src/IR/IR.jl
@@ -356,6 +356,11 @@ function ArrayAttribute(attributes::Vector{Attribute})
         API.mlirArrayAttrGet(context(), length(attributes), attributes),
     )
 end
+function DenseArrayAttribute(values::AbstractVector{Int32})
+    Attribute(
+        API.mlirDenseI32ArrayGet(context(), length(values), collect(values))
+    )
+end
 function DenseArrayAttribute(values::AbstractVector{Int})
     Attribute(
         API.mlirDenseI64ArrayGet(context(), length(values), collect(values))

diff --git a/src/IR/Pass.jl b/src/IR/Pass.jl
@@ -82,7 +82,7 @@ function add_pipeline!(op_pass::OpPassManager, pipeline)
     @static if isdefined(API, :mlirOpPassManagerAddPipeline)
         io = IOBuffer()
         c_print_callback = @cfunction(print_callback, Cvoid, (MlirStringRef, Any))
-        result = GC.@preserve io API.mlirOpPassManagerAddPipeline(op_pass, pipeline, c_print_callback, io)
+        result = API.mlirOpPassManagerAddPipeline(op_pass, pipeline, c_print_callback, Ref(io))
         if mlirLogicalResultIsFailure(result)
             exc = AddPipelineException(String(take!(io)))
             throw(exc)
@@ -171,4 +171,4 @@ end
         mlir_pass
     end
 
-end
+end
diff --git a/test/executionengine.jl b/test/executionengine.jl
@@ -16,7 +16,6 @@ function registerAllUpstreamDialects!(ctx)
     return nothing
 end
 
-# TODO: Fix for LLVM 15
 function lowerModuleToLLVM(ctx, mod)
     pm = MLIR.API.mlirPassManagerCreate(ctx)
     if LLVM.version() >= v"15"
@@ -26,17 +25,24 @@ function lowerModuleToLLVM(ctx, mod)
     end
     opm = MLIR.API.mlirPassManagerGetNestedUnder(pm, op)
     if LLVM.version() >= v"15"
-                MLIR.API.mlirPassManagerAddOwnedPass(pm,
+        MLIR.API.mlirPassManagerAddOwnedPass(pm,
             MLIR.API.mlirCreateConversionConvertFuncToLLVM()
         )
     else
         MLIR.API.mlirPassManagerAddOwnedPass(pm,
             MLIR.API.mlirCreateConversionConvertStandardToLLVM()
         )
     end
-    MLIR.API.mlirOpPassManagerAddOwnedPass(opm,
-        MLIR.API.mlirCreateConversionConvertArithmeticToLLVM()
-    )
+
+    if LLVM.version() >= v"16"
+        MLIR.API.mlirOpPassManagerAddOwnedPass(opm,
+            MLIR.API.mlirCreateConversionArithToLLVMConversionPass()
+        )
+    else
+        MLIR.API.mlirOpPassManagerAddOwnedPass(opm,
+            MLIR.API.mlirCreateConversionConvertArithmeticToLLVM()
+        )
+    end
     status = MLIR.API.mlirPassManagerRun(pm, mod)
     # undefined symbol: mlirLogicalResultIsFailure
     if status.value == 0
@@ -74,8 +80,13 @@ MLIR.API.mlirRegisterAllLLVMTranslations(ctx)
 
 # TODO add C-API for translateModuleToLLVMIR
 
-jit = MLIR.API.mlirExecutionEngineCreate(
-    mod, #=optLevel=# 2, #=numPaths=# 0, #=sharedLibPaths=# C_NULL)
+jit = if LLVM.version() >= v"16"
+    MLIR.API.mlirExecutionEngineCreate(
+        mod, #=optLevel=# 2, #=numPaths=# 0, #=sharedLibPaths=# C_NULL, #= enableObjectDump =# false)
+else
+    MLIR.API.mlirExecutionEngineCreate(
+        mod, #=optLevel=# 2, #=numPaths=# 0, #=sharedLibPaths=# C_NULL)
+end
 
 if jit == C_NULL
     error("Execution engine creation failed")