From 5ed1d7986581b885419ada3b99a5e7fb9459f9c3 Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Mon, 18 May 2020 10:39:17 -0500 Subject: [PATCH 1/3] Fix AMDGPU reverse CI --- .gitlab-ci.yml | 22 +++++++++++----------- test/gcn.jl | 8 ++++---- test/runtests.jl | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 868c0da4..c9ee69f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,9 +38,9 @@ cuda:1.4: allow_failure: true -# AMDGPUnative.jl +# AMDGPU.jl -.test_amdgpunative: +.test_amdgpu: extends: .test image: rocm/dev-ubuntu-18.04 script: @@ -48,16 +48,16 @@ cuda:1.4: Pkg.develop(PackageSpec(path=pwd())); Pkg.build();' - julia -e 'using Pkg; - Pkg.add(PackageSpec(name="AMDGPUnative", rev="jps/gpucompiler")); - Pkg.test("AMDGPUnative");' + Pkg.add(PackageSpec(name="AMDGPU", rev="master")); + Pkg.test("AMDGPU");' -# amdgpunative:1.4: -# extends: -# - .julia:1.4 -# - .test_amdgpunative -# tags: -# - rocm -# allow_failure: true +amdgpu:1.4: + extends: + - .julia:1.4 + - .test_amdgpu + tags: + - rocm + allow_failure: true # other tasks diff --git a/test/gcn.jl b/test/gcn.jl index d304ff48..f8446c50 100644 --- a/test/gcn.jl +++ b/test/gcn.jl @@ -74,8 +74,8 @@ end end asm = sprint(io->gcn_code_native(io, entry, Tuple{Int64}; dump_module=true, kernel=true)) - @test occursin(r"\.amdgpu_hsa_kernel .*julia_entry", asm) - @test !occursin(r"\.amdgpu_hsa_kernel .*julia_nonentry", asm) + @test occursin(r"\.amdhsa_kernel _Z\d*julia_entry", asm) + @test !occursin(r"\.amdhsa_kernel _Z\d*julia_nonentry", asm) @test occursin(r"\.type.*julia_nonentry_\d*,@function", asm) end @@ -90,7 +90,7 @@ end end asm = sprint(io->gcn_code_native(io, parent1, Tuple{Int}; dump_module=true)) - @test occursin(r"\.type.*julia__\d*_child_\d*,@function", asm) + @test occursin(r"\.type.*julia_[[:alnum:]_.]*child_\d*,@function", asm) function parent2(i) child(i+1) @@ -98,7 +98,7 @@ end end asm = sprint(io->gcn_code_native(io, parent2, Tuple{Int}; dump_module=true)) - @test occursin(r"\.type.*julia__\d*_child_\d*,@function", asm) + @test occursin(r"\.type.*julia_[[:alnum:]_.]*child_\d*,@function", asm) end @testset "child function reuse bis" begin diff --git a/test/runtests.jl b/test/runtests.jl index c4cb7f3a..5ce22e2a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -21,7 +21,7 @@ if VERSION >= v"1.4" Pkg.add(["SPIRV_LLVM_Translator_jll", "SPIRV_Tools_jll"]) include("spirv.jl") end -#include("gcn.jl") +include("gcn.jl") include("examples.jl") From 5e741bd6660dd75771ba2bd8352a8e9ac5417332 Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Fri, 21 Aug 2020 08:46:06 -0500 Subject: [PATCH 2/3] Disable s_cbranch_execz AMDGPU test --- test/gcn.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gcn.jl b/test/gcn.jl index f8446c50..15a0bcc6 100644 --- a/test/gcn.jl +++ b/test/gcn.jl @@ -46,7 +46,7 @@ end asm = sprint(io->gcn_code_native(io, kernel, Tuple{})) @test occursin("s_trap 2", asm) - @test_broken occursin("s_cbranch_execz", asm) + @test_skip occursin("s_cbranch_execz", asm) if Base.libllvm_version < v"9" @test_broken occursin("v_readfirstlane", asm) end From 4e67123507accad83e772d919924799e6a8d76d2 Mon Sep 17 00:00:00 2001 From: Julian P Samaroo Date: Fri, 21 Aug 2020 12:49:02 -0500 Subject: [PATCH 3/3] Don't test GCN on Julia 1.3 --- test/runtests.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 5ce22e2a..69186bef 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -20,8 +20,8 @@ include("ptx.jl") if VERSION >= v"1.4" Pkg.add(["SPIRV_LLVM_Translator_jll", "SPIRV_Tools_jll"]) include("spirv.jl") + include("gcn.jl") end -include("gcn.jl") include("examples.jl")