Skip to content

Commit 6946763

Browse files
authored
Merge pull request #226 from JuliaGPU/tb/latency
Don't require DataStructures.jl.
2 parents 513a596 + c4ed4e8 commit 6946763

File tree

4 files changed

+2
-54
lines changed

4 files changed

+2
-54
lines changed

Manifest.toml

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,10 @@ git-tree-sha1 = "215a9aa4a1f23fbd05b92769fdd62559488d70e9"
1414
uuid = "fa961155-64e5-5f13-b03f-caf6b980ea82"
1515
version = "0.4.1"
1616

17-
[[Compat]]
18-
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
19-
git-tree-sha1 = "dc7dedc2c2aa9faf59a55c622760a25cbefbe941"
20-
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
21-
version = "3.31.0"
22-
23-
[[DataStructures]]
24-
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
25-
git-tree-sha1 = "4437b64df1e0adccc3e5d1adbc3ac741095e4677"
26-
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
27-
version = "0.18.9"
28-
2917
[[Dates]]
3018
deps = ["Printf"]
3119
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
3220

33-
[[DelimitedFiles]]
34-
deps = ["Mmap"]
35-
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
36-
37-
[[Distributed]]
38-
deps = ["Random", "Serialization", "Sockets"]
39-
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
40-
4121
[[Downloads]]
4222
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
4323
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
@@ -88,10 +68,6 @@ uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
8868
[[Libdl]]
8969
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
9070

91-
[[LinearAlgebra]]
92-
deps = ["Libdl"]
93-
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
94-
9571
[[Logging]]
9672
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
9773

@@ -103,20 +79,12 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
10379
deps = ["Artifacts", "Libdl"]
10480
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
10581

106-
[[Mmap]]
107-
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
108-
10982
[[MozillaCACerts_jll]]
11083
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
11184

11285
[[NetworkOptions]]
11386
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
11487

115-
[[OrderedCollections]]
116-
git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c"
117-
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
118-
version = "1.4.1"
119-
12088
[[Pkg]]
12189
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
12290
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -145,21 +113,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
145113
[[Serialization]]
146114
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
147115

148-
[[SharedArrays]]
149-
deps = ["Distributed", "Mmap", "Random", "Serialization"]
150-
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
151-
152116
[[Sockets]]
153117
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
154118

155-
[[SparseArrays]]
156-
deps = ["LinearAlgebra", "Random"]
157-
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
158-
159-
[[Statistics]]
160-
deps = ["LinearAlgebra", "SparseArrays"]
161-
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
162-
163119
[[TOML]]
164120
deps = ["Dates"]
165121
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
@@ -168,10 +124,6 @@ uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
168124
deps = ["ArgTools", "SHA"]
169125
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
170126

171-
[[Test]]
172-
deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
173-
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
174-
175127
[[TimerOutputs]]
176128
deps = ["ExprTools", "Printf"]
177129
git-tree-sha1 = "209a8326c4f955e2442c07b56029e88bb48299c7"

Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ authors = ["Tim Besard <[email protected]>"]
44
version = "0.12.6"
55

66
[deps]
7-
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
87
ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
98
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
109
LLVM = "929cbde3-209d-540e-8aea-75f648917ca0"
@@ -14,7 +13,6 @@ TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
1413
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
1514

1615
[compat]
17-
DataStructures = "0.15, 0.16, 0.17, 0.18"
1816
ExprTools = "0.1"
1917
LLVM = "4.0"
2018
TimerOutputs = "0.5"

src/GPUCompiler.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ module GPUCompiler
33
using LLVM
44
using LLVM.Interop
55

6-
using DataStructures
7-
86
using TimerOutputs
97

108
using ExprTools: splitdef, combinedef

src/driver.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ const __llvm_initialized = Ref(false)
244244

245245
# find deferred compiler
246246
# TODO: recover this information earlier, from the Julia IR
247-
worklist = MultiDict{CompilerJob, LLVM.CallInst}()
247+
worklist = Dict{CompilerJob, Vector{LLVM.CallInst}}()
248248
for use in uses(dyn_marker)
249249
# decode the call
250250
call = user(use)::LLVM.CallInst
@@ -255,7 +255,7 @@ const __llvm_initialized = Ref(false)
255255
if dyn_job isa FunctionSpec
256256
dyn_job = similar(job, dyn_job)
257257
end
258-
push!(worklist, dyn_job => call)
258+
push!(get!(worklist, dyn_job, LLVM.CallInst[]), call)
259259
end
260260

261261
# compile and link

0 commit comments

Comments
 (0)