Adapt to removal of CombineMulAdd pass. (#645)

JuliaGPU · Oct 22, 2024 · c71f5b6 · c71f5b6
1 parent 3445ea7
commit c71f5b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,13 +18,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['1.10', 'pre', 'nightly']
+        version: ['1.10', '1.11', 'nightly']
         os: [ubuntu-latest, macOS-latest, windows-latest]
         arch: [x64]
         llvm_args: ['']
         include:
           # starting with Julia 1.10, we can enable opaque pointers
-          # from Juila 1.12 on, this is the default.
+          # from Julia 1.12 on, this is the default.
           - version: '1.10'
             os: 'ubuntu-latest'
             arch: 'x64'
@@ -37,15 +37,15 @@ jobs:
             os: 'windows-latest'
             arch: 'x64'
             llvm_args: '--opaque-pointers'
-          - version: 'pre'
+          - version: '1.11'
             os: 'ubuntu-latest'
             arch: 'x64'
             llvm_args: '--opaque-pointers'
-          - version: 'pre'
+          - version: '1.11'
             os: 'macOS-latest'
             arch: 'x64'
             llvm_args: '--opaque-pointers'
-          - version: 'pre'
+          - version: '1.11'
             os: 'windows-latest'
             arch: 'x64'
             llvm_args: '--opaque-pointers'

diff --git a/src/optim.jl b/src/optim.jl
@@ -266,7 +266,9 @@ end
 function buildCleanupPipeline(mpm, @nospecialize(job::CompilerJob), opt_level)
     if opt_level >= 2
         add!(mpm, NewPMFunctionPassManager()) do fpm
-            add!(fpm, CombineMulAddPass())
+            if VERSION < v"1.12.0-DEV.1390"
+                add!(fpm, CombineMulAddPass())
+            end
             add!(fpm, DivRemPairsPass())
         end
     end