From a0651fb85fa8e9d0bad608c16a80fb884756bc86 Mon Sep 17 00:00:00 2001 From: Nathan Daly Date: Mon, 14 Aug 2023 10:30:04 -0600 Subject: [PATCH] Remove type inference profiling, since thread safety was never merged upstream: https://github.com/JuliaLang/julia/pull/47615 was never merged, so this feature cannot be used yet anyway. :( And the compat bounds are currently too strict, and are causing issues in RelationalAI's build --- Project.toml | 6 ------ src/ProfileEndpoints.jl | 45 ----------------------------------------- test/runtests.jl | 24 ---------------------- 3 files changed, 75 deletions(-) diff --git a/Project.toml b/Project.toml index 2535401..49de865 100644 --- a/Project.toml +++ b/Project.toml @@ -4,20 +4,14 @@ authors = ["Nathan Daly ", "Dana Wilson version = "1.0.1" [deps] -FlameGraphs = "08572546-2f56-4bcf-ba4e-bab62c3a3f89" HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3" PProf = "e4faabce-9ead-11e9-39d9-4379958e3056" Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b" -SnoopCompile = "aa65fe97-06da-5843-b5b1-d5d13cad87d2" -SnoopCompileCore = "e2b509da-e806-4183-be48-004708413034" [compat] HTTP = "1" PProf = "2" -FlameGraphs = "1" -SnoopCompile = "2.10" -SnoopCompileCore = "2.10" julia = "1.6" [extras] diff --git a/src/ProfileEndpoints.jl b/src/ProfileEndpoints.jl index bd254ed..2530f85 100644 --- a/src/ProfileEndpoints.jl +++ b/src/ProfileEndpoints.jl @@ -4,10 +4,6 @@ import HTTP import Profile import PProf -using FlameGraphs -using SnoopCompile -import SnoopCompileCore - using Serialization: serialize #---------------------------------------------------------- @@ -247,42 +243,6 @@ end end # if isdefined -### -### Type Inference -### - -function typeinf_start_endpoint(req::HTTP.Request) - if !isdefined(Core.Compiler.Timings, :clear_and_fetch_timings) - # See: https://github.com/JuliaLang/julia/pull/47615. - return HTTP.Response(501, "Type inference profiling isn't thread safe without Julia #47615.") - end - SnoopCompileCore.start_deep_timing() - return HTTP.Response(200, "Type inference profiling started.") -end - -function typeinf_stop_endpoint(req::HTTP.Request) - if !isdefined(Core.Compiler.Timings, :clear_and_fetch_timings) - # See: https://github.com/JuliaLang/julia/pull/47615. - return HTTP.Response(501, "Type inference profiling isn't thread safe without Julia #47615.") - end - - SnoopCompileCore.stop_deep_timing() - timings = SnoopCompileCore.finish_snoopi_deep() - - # Currently, SnoopCompile will throw an error if timings is empty.. - # Reported, here: https://github.com/timholy/SnoopCompile.jl/pull/212/files#r1062926193 - if isempty(timings.children) - # So just return an empty profile.. - return _http_response("", "inference_profile.pb.gz") - end - - flame_graph = flamegraph(timings) - prof_name = tempname() - PProf.pprof(flame_graph; out=prof_name, web=false) - prof_name = "$prof_name.pb.gz" - return _http_response(read(prof_name), "inference_profile.pb.gz") -end - ### ### Server ### @@ -297,8 +257,6 @@ function serve_profiling_server(;addr="127.0.0.1", port=16825, verbose=false, kw HTTP.register!(router, "/allocs_profile", allocations_profile_endpoint) HTTP.register!(router, "/allocs_profile_start", allocations_start_endpoint) HTTP.register!(router, "/allocs_profile_stop", allocations_stop_endpoint) - HTTP.register!(router, "/typeinf_profile_start", typeinf_start_endpoint) - HTTP.register!(router, "/typeinf_profile_stop", typeinf_stop_endpoint) # HTTP.serve! returns listening/serving server object return HTTP.serve!(router, addr, port; verbose, kw...) end @@ -324,9 +282,6 @@ function __init__() precompile(_start_alloc_profile, (Float64,)) || error("precompilation of package functions is not supposed to fail") precompile(_stop_alloc_profile, ()) || error("precompilation of package functions is not supposed to fail") end - - precompile(typeinf_start_endpoint, (HTTP.Request,)) || error("precompilation of package functions is not supposed to fail") - precompile(typeinf_stop_endpoint, (HTTP.Request,)) || error("precompilation of package functions is not supposed to fail") end end # module ProfileEndpoints diff --git a/test/runtests.jl b/test/runtests.jl index da34a3a..a453f62 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -154,30 +154,6 @@ const url = "http://127.0.0.1:$port" end end - @testset "Type inference profiling" begin - if !isdefined(Core.Compiler.Timings, :clear_and_fetch_timings) - @test HTTP.get("$url/typeinf_profile_start", retry=false, status_exception=false).status == 501 - @test HTTP.get("$url/typeinf_profile_stop", retry=false, status_exception=false).status == 501 - else - @testset "typeinf start/stop endpoints" begin - resp = HTTP.get("$url/typeinf_profile_start", retry=false, status_exception=false) - @test resp.status == 200 - @test String(resp.body) == "Type inference profiling started." - - # workload - @eval foo() = 2 - @eval foo() - - resp = HTTP.get("$url/typeinf_profile_stop", retry=false, status_exception=false) - @test resp.status == 200 - data = read(IOBuffer(resp.body), String) - # Test that there's something here - # TODO: actually parse the profile - @test length(data) > 100 - end - end - end - @testset "error handling" begin let res = HTTP.get("$url/profile", status_exception=false) @test 400 <= res.status < 500