fix executionengine tests

JuliaLLVM · Jan 16, 2024 · 1d95e41 · 1d95e41
1 parent d20023a
commit 1d95e41
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/examples/brutus.jl b/examples/brutus.jl
@@ -292,7 +292,7 @@ fptr = IR.context!(IR.Context()) do
 
     IR.run!(pm, mod)
 
-    jit = if LLVM.version().major <= 15
+    jit = if LLVM.version() <= v"15"
         MLIR.API.mlirExecutionEngineCreate(mod, 0, 0, C_NULL)
     else
         MLIR.API.mlirExecutionEngineCreate(mod, 0, 0, C_NULL, false)

diff --git a/src/Dialects.jl b/src/Dialects.jl
@@ -13,7 +13,7 @@ end
 
 operandsegmentsizes(segments) =
     namedattribute("operand_segment_sizes",
-        LLVM.version().major <= 15 ?
+        LLVM.version() <= v"15" ?
             Attribute(Int32.(segments)) :
             DenseArrayAttribute(Int32.(segments))
     )

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"15"
+    MLIR.API.mlirExecutionEngineCreate(
+        mod, #=optLevel=# 2, #=numPaths=# 0, #=sharedLibPaths=# C_NULL)
+else
+    MLIR.API.mlirExecutionEngineCreate(
+        mod, #=optLevel=# 2, #=numPaths=# 0, #=sharedLibPaths=# C_NULL, #= enableObjectDump =# false)
+end
 
 if jit == C_NULL
     error("Execution engine creation failed")