Skip to content

Fix AMDGPU reverse CI #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 21, 2020
Merged

Fix AMDGPU reverse CI #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ed1d79
Fix AMDGPU reverse CI
jpsamaroo May 18, 2020
5e741bd
Disable s_cbranch_execz AMDGPU test
jpsamaroo Aug 21, 2020
4e67123
Don't test GCN on Julia 1.3
jpsamaroo Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,26 @@ cuda:1.4:
allow_failure: true


# AMDGPUnative.jl
# AMDGPU.jl

.test_amdgpunative:
.test_amdgpu:
extends: .test
image: rocm/dev-ubuntu-18.04
script:
- julia -e 'using Pkg;
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
Expand Down
10 changes: 5 additions & 5 deletions test/gcn.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -90,15 +90,15 @@ 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)
return
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
Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down