Skip to content
This repository was archived by the owner on Nov 18, 2020. It is now read-only.

Commit f02d7ec

Browse files
authored
Merge pull request #41 from JuliaGPU/jps/missing-symbol
* Bump HSARuntime to 0.2.9 to fix missing symbols * Add julia 1.4, disable LLVM7 source in CI * Add wait() call to tests, disable math intrinsic tests
2 parents 5ebd505 + c9832e1 commit f02d7ec

File tree

8 files changed

+23
-16
lines changed

8 files changed

+23
-16
lines changed

.gitlab-ci.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ test:1.3:
3333
tags:
3434
- rocm
3535

36+
test:1.4:
37+
extends:
38+
- .julia:1.4
39+
- .test
40+
tags:
41+
- rocm
42+
3643
test:nightly:
3744
extends:
3845
- .julia:nightly
@@ -44,12 +51,12 @@ test:nightly:
4451

4552
# special tests
4653

47-
test:source:llvm9:
48-
extends:
49-
- .julia:source
50-
- .test
51-
tags:
52-
- rocm
53-
allow_failure: true
54-
variables:
55-
CI_BUILD_ARGS: 'LLVM_VER=9.0.1 USE_BINARYBUILDER_LLVM=0'
54+
#test:source:llvm9:
55+
# extends:
56+
# - .julia:source
57+
# - .test
58+
# tags:
59+
# - rocm
60+
# allow_failure: true
61+
# variables:
62+
# CI_BUILD_ARGS: 'LLVM_VER=9.0.1 USE_BINARYBUILDER_LLVM=0'

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
1717
Adapt = "0.4, 1.0"
1818
BinaryProvider = "0.5"
1919
DataStructures = "0.15, 0.16, 0.17"
20-
HSARuntime = "0.2.7"
20+
HSARuntime = "0.2.9"
2121
LLVM = "1.3"
2222
Requires = "1"
2323
TimerOutputs = "0.5"

src/runtime.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct RuntimeEvent{E}
2020
end
2121
create_event() = RuntimeEvent(create_event(RUNTIME[]))
2222
create_event(::typeof(HSA)) = HSASignal()
23-
Base.wait(event::RuntimeEvent) = wait(event.event)
23+
Base.wait(event::RuntimeEvent; kwargs...) = wait(event.event; kwargs...)
2424

2525
struct RuntimeExecutable{E}
2626
exe::E

test/device/indexing.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ end
3232

3333
A = zeros(Int64, 6)
3434
HA = HSAArray(A)
35-
@roc groupsize=(1,2,3) gridsize=(4,5,6) dim_kern(HA)
35+
wait(@roc groupsize=(1,2,3) gridsize=(4,5,6) dim_kern(HA))
3636
A = Array(HA)
3737
@test A [1,2,3,4,5,6]
3838

test/device/math.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
""
3535
end
3636

37-
@roc groupsize=len gridsize=len $intr_kern(d_a)
37+
wait(@roc groupsize=len gridsize=len $intr_kern(d_a))
3838
_a = Array(d_a)
3939
@test $modname.$jlintr.(a) _a
4040
end

test/device/memory.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ B = zeros(Float32, 1)
2929
HA = HSAArray(A)
3030
HB = HSAArray(B)
3131

32-
@roc groupsize=1 gridsize=1 memory_static_kernel(HA, HB)
32+
wait(@roc groupsize=1 gridsize=1 memory_static_kernel(HA, HB))
3333

3434
@test Array(HA) Array(HB)
3535

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if AMDGPUnative.configured
3030
include("device/indexing.jl")
3131
include("device/hostcall.jl")
3232
if Base.libllvm_version >= v"7.0"
33-
include("device/math.jl")
33+
@test_skip include("device/math.jl")
3434
else
3535
@warn "Testing with LLVM 6; some tests will be disabled!"
3636
@test_skip "Math Intrinsics"

test/vadd.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
""
3232
end
3333

34-
@roc groupsize=len gridsize=len vadd(d_a, d_b, d_c)
34+
wait(@roc groupsize=len gridsize=len vadd(d_a, d_b, d_c))
3535
@debug begin
3636
@show d_a
3737
@show d_b

0 commit comments

Comments
 (0)