Skip to content

Commit eab97f2

Browse files
committed
Fix tests.
1 parent 076eb6f commit eab97f2

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

test/native.jl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,10 @@ end
340340
end
341341

342342
@testset "always_inline" begin
343-
# XXX: broken by JuliaLang/julia#51599, see JuliaGPU/GPUCompiler.jl#527
343+
# XXX: broken by JuliaLang/julia#51599, see JuliaGPU/GPUCompiler.jl#527.
344+
# yet somehow this works on 1.12?
345+
broken = VERSION >= v"1.13-"
346+
344347
mod = @eval module $(gensym())
345348
import ..sink
346349
expensive(x) = $(foldl((e, _) -> :($sink($e) + $sink(x)), 1:100; init=:x))
@@ -359,20 +362,20 @@ end
359362
Native.code_llvm(mod.g, Tuple{Int64}; dump_module=true, kernel=true)
360363
end
361364

362-
@test @filecheck begin
365+
@test @filecheck(begin
363366
check"CHECK-NOT: @{{(julia|j)_expensive_[0-9]+}}"
364367
Native.code_llvm(mod.g, Tuple{Int64}; dump_module=true, kernel=true, always_inline=true)
365-
end
368+
end) broken=broken
366369

367370
@test @filecheck begin
368371
check"CHECK: @{{(julia|j)_expensive_[0-9]+}}"
369372
Native.code_llvm(mod.h, Tuple{Int64}; dump_module=true, kernel=true)
370373
end
371374

372-
@test @filecheck begin
375+
@test @filecheck(begin
373376
check"CHECK-NOT: @{{(julia|j)_expensive_[0-9]+}}"
374377
Native.code_llvm(mod.h, Tuple{Int64}; dump_module=true, kernel=true, always_inline=true)
375-
end
378+
end) broken=broken
376379
end
377380

378381
@testset "function attributes" begin
@@ -659,7 +662,7 @@ end
659662
a[1] = a[1]^2
660663
return
661664
end
662-
665+
663666
function dkernel(a)
664667
ptr = Enzyme.deferred_codegen(typeof(kernel), Tuple{Vector{Float64}})
665668
ccall(ptr, Cvoid, (Vector{Float64},), a)

test/setup.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function runtests(f, name)
6565
end
6666

6767
old_print_setting = Test.TESTSET_PRINT_ENABLE[]
68-
if VERSION >= v"1.13.0-DEV.1044"
68+
@static if VERSION >= v"1.13.0-DEV.1044"
6969
@with Test.TESTSET_PRINT_ENABLE=>false begin
7070
inner()
7171
end

test/spirv.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ end
7878
backend, supports_fp16=false)) do msg
7979
occursin("unsupported use of half value", msg) &&
8080
occursin("[1] unsafe_store!", msg) &&
81-
occursin("[2] kernel", msg)
81+
occursin(r"\[\d+\] kernel", msg)
8282
end
8383

8484
@test_throws_message(InvalidIRError,
8585
SPIRV.code_execution(mod.kernel, Tuple{Ptr{Float64}, Float64};
8686
backend, supports_fp64=false)) do msg
8787
occursin("unsupported use of double value", msg) &&
8888
occursin("[1] unsafe_store!", msg) &&
89-
occursin("[2] kernel", msg)
89+
occursin(r"\[\d+\] kernel", msg)
9090
end
9191
end
9292

0 commit comments

Comments
 (0)